From bb9b335602e803f624c0888c0128baa9e3c320de Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 13 Feb 2011 18:59:54 +0000 Subject: Makefile: if backports architecture list I removed the case-mangling for codenames in order to simplify this, so the change is smaller than it looks. git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@16127 e39458fd-73e7-0310-bf30-c45bca0a0e42 --- Makefile | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 08df5de378..8f51b88096 100644 --- a/Makefile +++ b/Makefile @@ -6,19 +6,15 @@ BUG_LISTS = $(wildcard data/*/list) # arbitrary at the moment. More architectures can be added later. MIRROR = http://cdn.debian.net/debian/ -LENNY_ARCHS = alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc -SQUEEZE_ARCHS = amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 -WHEEZY_ARCHS = amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 -SID_ARCHS = alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc +lenny_ARCHS = alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc +squeeze_ARCHS = amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 +wheezy_ARCHS = amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 +sid_ARCHS = alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc OLDSTABLE = lenny STABLE = squeeze TESTING = wheezy -OLDSTABLE_uc = $(shell echo "$(OLDSTABLE)" | tr "[:lower:]" "[:upper:]") -STABLE_uc = $(shell echo "$(STABLE)" | tr "[:lower:]" "[:upper:]") -TESTING_uc = $(shell echo "$(TESTING)" | tr "[:lower:]" "[:upper:]") - all: rm -f data/security-new.db data/security-new.db.journal if test -e data/security.db; then cp data/security.db data/security-new.db; fi @@ -60,7 +56,7 @@ update-packages: update-testing $(MIRROR)/dists/$$rel/$$archive/source/Sources \ data/packages/$${rel}__$${archive}_Sources ; \ done ; \ - for arch in $(SID_ARCHS) ; do \ + for arch in $(sid_ARCHS) ; do \ for archive in main contrib non-free ; do \ $(PYTHON) bin/apt-update-file \ $(MIRROR)/dists/$$rel/$$archive/binary-$$arch/Packages \ @@ -76,7 +72,7 @@ update-testing: $(MIRROR)/dists/$$rel/$$archive/source/Sources \ data/packages/$${rel}__$${archive}_Sources ; \ done ; \ - for arch in $($(TESTING_uc)_ARCHS) ; do \ + for arch in $($(TESTING)_ARCHS) ; do \ for archive in main contrib non-free ; do \ $(PYTHON) bin/apt-update-file \ $(MIRROR)/dists/$$rel/$$archive/binary-$$arch/Packages \ @@ -92,7 +88,7 @@ update-stable: update-oldstable $(MIRROR)/dists/$$rel/$$archive/source/Sources \ data/packages/$${rel}__$${archive}_Sources ; \ done ; \ - for arch in $($(STABLE_uc)_ARCHS) ; do \ + for arch in $($(STABLE)_ARCHS) ; do \ for archive in main contrib non-free ; do \ $(PYTHON) bin/apt-update-file \ $(MIRROR)/dists/$$rel/$$archive/binary-$$arch/Packages \ @@ -108,7 +104,7 @@ update-oldstable: $(MIRROR)/dists/$$rel/$$archive/source/Sources \ data/packages/$${rel}__$${archive}_Sources ; \ done ; \ - for arch in $($(OLDSTABLE_uc)_ARCHS) ; do \ + for arch in $($(OLDSTABLE)_ARCHS) ; do \ for archive in main contrib non-free ; do \ $(PYTHON) bin/apt-update-file \ $(MIRROR)/dists/$$rel/$$archive/binary-$$arch/Packages \ @@ -123,7 +119,7 @@ ST_FILE = data/packages/$(TESTING)_security_ update-testing-security: $(PYTHON) bin/apt-update-file \ $(ST_MIRROR)/main/source/Sources $(ST_FILE)main_Sources - set -e ; for arch in $($(TESTING_uc)_ARCHS) ; do \ + set -e ; for arch in $($(TESTING)_ARCHS) ; do \ $(PYTHON) bin/apt-update-file \ $(ST_MIRROR)/main/binary-$${arch}/Packages $(ST_FILE)main_$${arch}_Packages ; \ done @@ -135,7 +131,7 @@ update-security: update-old-security $(PYTHON) bin/apt-update-file \ $(SEC_MIRROR)/$$archive/updates/$$section/source/Sources \ data/packages/$${archive}_security_$${section}_Sources ; \ - for arch in $($(STABLE_uc)_ARCHS) ; do \ + for arch in $($(STABLE)_ARCHS) ; do \ $(PYTHON) bin/apt-update-file \ $(SEC_MIRROR)/$$archive/updates/$$section/binary-$$arch/Packages \ data/packages/$${archive}_security_$${section}_$${arch}_Packages ; \ @@ -149,7 +145,7 @@ update-old-security: $(PYTHON) bin/apt-update-file \ $(SEC_MIRROR)/$$archive/updates/$$section/source/Sources \ data/packages/$${archive}_security_$${section}_Sources ; \ - for arch in $($(OLDSTABLE_uc)_ARCHS) ; do \ + for arch in $($(OLDSTABLE)_ARCHS) ; do \ $(PYTHON) bin/apt-update-file \ $(SEC_MIRROR)/$$archive/updates/$$section/binary-$$arch/Packages \ data/packages/$${archive}_security_$${section}_$${arch}_Packages ; \ @@ -174,9 +170,11 @@ update-volatile: data/packages/lenny-volatile__main_armel_Packages BACKPORTS_MIRROR = http://ftp.de.debian.org/debian-backports/dists -update-backports: - set -e && for archive in $(OLDSTABLE) $(STABLE) ; do \ - for arch in $(SQUEEZE_ARCHS) ; do \ +update-backports: update-backports-$(STABLE) update-backports-$(OLDSTABLE) + +update-backports-%: + set -e && archive=$(shell echo $@ | cut -d- -f3) ; \ + for arch in $($(shell echo $@ | cut -d- -f3)_ARCHS) ; do \ $(PYTHON) bin/apt-update-file \ $(BACKPORTS_MIRROR)/$${archive}-backports/main/binary-$$arch/Packages \ data/packages/$${archive}-backports__main_$${arch}_Packages ; \ @@ -184,10 +182,6 @@ update-backports: $(PYTHON) bin/apt-update-file \ $(BACKPORTS_MIRROR)/$${archive}-backports/main/source/Sources \ data/packages/$${archive}-backports__main_Sources ; \ - done - $(PYTHON) bin/apt-update-file \ - $(BACKPORTS_MIRROR)/lenny-backports/main/binary-armel/Packages \ - data/packages/lenny-backports__main_armel_Packages update-lists: svn update -q data -- cgit v1.2.3