Write upstream var into branch.mk when doing make update upstream=...

diff --git a/fedora/Makefile b/fedora/Makefile
index 5b240f6fbecd581d244551a8edd6628a18867729..cefeab5f8b80701a6a8419108d29f407a581cd1b 100644 (file)
--- a/fedora/Makefile
+++ b/fedora/Makefile
@@ -43,7 +43,7 @@ update:
        cvs -Q rtag $(if $(on-branch),-r $(glibc-base),-D "$$now") $$new libc;\
        )\
        (echo '# This file is updated automatically by Makefile.'; \
-        $(foreach var,$(branch.mk-vars),\
+        $(foreach var,$(branch.mk-vars) $(if $(upstream-tag),upstream),\
                   $(if $($(var)),echo '$(var) := $($(var))';)) \
         echo "$(glibc-branch)-sync-date := $$now"; \
         echo "$(glibc-branch)-sync-tag := $$new"; \

diff --git a/fedora/branch.mk b/fedora/branch.mk
index c38d2c4d489b1a29b901f1ba2a0c0c112b89151f..4223a622001e9e6ef0a0e006de3de1b76dd7270d 100644 (file)
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -6,3 +6,4 @@ COLLECTION := dist-fc3-updates-candidate
 releases-url := ftp://sources.redhat.com/pub/glibc/releases
 fedora-2_3-sync-date := 2005-04-07 02:42 UTC
 fedora-2_3-sync-tag := glibc-2_3_5
+upstream := 2.3.5