diff options
| author | Roland McGrath <roland@gnu.org> | 2004-09-23 00:59:04 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-09-23 00:59:04 +0000 |
| commit | 237910315c39b9b674045872c9b4e99c1369d911 (patch) | |
| tree | ccd775d963f816b3153805a9d88acbd6998ec920 | |
| parent | a0d24ebc124a3ca47b257109fce14fc81a0cf363 (diff) | |
| download | glibc-237910315c39b9b674045872c9b4e99c1369d911.tar.gz glibc-237910315c39b9b674045872c9b4e99c1369d911.tar.xz glibc-237910315c39b9b674045872c9b4e99c1369d911.zip | |
More update tweaks.
| -rw-r--r-- | fedora/Makefile | 21 | ||||
| -rw-r--r-- | fedora/branch.mk | 1 |
2 files changed, 7 insertions, 15 deletions
diff --git a/fedora/Makefile b/fedora/Makefile index c5b90f348c..cd2d19bea8 100644 --- a/fedora/Makefile +++ b/fedora/Makefile @@ -16,32 +16,23 @@ on-branch = $(filter-out HEAD,$(glibc-base)) snapshot-date := $($(glibc-branch)-sync-date) snapshot-name := $(shell date -u -d '$(snapshot-date)' $(snapshot-name-fmt)) -ifeq ($(glibc-base),HEAD) -tar-name := glibc -select-snapshot = -D '$(snapshot-date)' -snapshot-id = $(glibc-base):$(snapshot-date) -else -tar-name := glibc-$(subst _,.,$(patsubst glibc-%-branch,%,$(glibc-base))) +tar-name := glibc-$(subst _,.,$(patsubst glibc-%-branch,%,\ + $(filter-out HEAD,$(glibc-base)))) select-snapshot = -r '$($(glibc-branch)-sync-tag)' snapshot-id = $($(glibc-branch)-sync-tag) -endif update: now=`date -u $(snapshot-date-fmt)`; \ name=`date -u -d "$$now" $(snapshot-name-fmt)`; \ - $(if $(on-branch),\ - old="$(tag-prefix)$(tar-name)-$$name; \ - new="$(tag-prefix)$(tar-name)$(snapshot-name)"; \ - cvs -Q rtag -r $(glibc-base) $$new libc; \ - , old="$(glibc-base):$(snapshot-date)"; \ - new="$(glibc-base):$$now"; \ - ) \ + old="$(tag-prefix)$(tar-name)-$(snapshot-name)"; \ + new="$(tag-prefix)$(tar-name)-$$name"; \ + cvs -Q rtag $(if $(on-branch),-r $(glibc-base),-D "$$now") $$new libc;\ (echo '# This file is updated automatically by Makefile.'; \ echo 'glibc-branch := $(glibc-branch)'; \ echo 'glibc-base := $(glibc-base)'; \ echo "$(glibc-branch)-sync-date := $$now"; \ - $(if $(on-branch),echo "$(glibc-branch)-sync-tag := $$new";) \ + echo "$(glibc-branch)-sync-tag := $$new"; \ ) > branch.mk; \ cd ..; (set -x; cvs -q update -d -P -j"$$old" -j"$$new") \ 2>&1 | tee fedora/update.log diff --git a/fedora/branch.mk b/fedora/branch.mk index 4cdca39426..1bc627c1c1 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -2,3 +2,4 @@ glibc-branch := fedora glibc-base := HEAD fedora-sync-date := 2004-09-22 05:52 UTC +fedora-sync-tag := fedora-glibc-20040922T0552 |