[Secure-testing-commits] r16127 - /

[Florian Weimer]

Author: fw
Date: 2011-02-13 18:59:54 +0000 (Sun, 13 Feb 2011)
New Revision: 16127

Modified:
   Makefile
Log:
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.


Modified: Makefile
===================================================================
--- Makefile	2011-02-13 18:56:29 UTC (rev 16126)
+++ Makefile	2011-02-13 18:59:54 UTC (rev 16127)
@@ -6,19 +6,15 @@
 # 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 @@
 			$(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 @@
 			$(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 @@
 			$(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 @@
 			$(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 @@
 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 @@
 	    $(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 @@
 	    $(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 @@
           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 @@
 	  $(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