Nakefile:

  List architectures in makefile variables.
  Pick some regular Debian mirror, since package diff support has
  graduated.


git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@2513 e39458fd-73e7-0310-bf30-c45bca0a0e42

1 files changed, 23 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 090c2de028..668e64b468 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,10 @@ BUG_LISTS = $(wildcard data/*/list)
 # Adjust these if necessary.  The architecture selection is arther
 # arbitrary at the moment.  More architectures can be added later.
 
-MIRROR = http://merkel.debian.org/~aba/debian/
+# MIRROR = http://merkel.debian.org/~aba/debian/
+MIRROR = http://ftp-stud.fht-esslingen.de/debian/
+SARGE_ARCHS = alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
+ETCH_ARCHS = $(SARGE_ARCHS)
 
 all:
 	$(PYTHON) bin/update-db
@@ -34,7 +37,7 @@ stamps/DTSA-syntax: data/DTSA/list bin/check-syntax $(PYTHON_MODULES)
 	touch $@
 
 .PHONY: update-packages update-etch-security
-RELEASES = sarge etch sid 
+RELEASES = etch sid 
 update-packages:
 	set -e ; for rel in $(RELEASES) ; do \
 		for archive in main contrib non-free ; do \
@@ -42,7 +45,7 @@ update-packages:
 			$(MIRROR)/dists/$$rel/$$archive/source/Sources \
 			data/packages/$${rel}__$${archive}_Sources ; \
 		done ; \
-	        for arch in i386 ia64 alpha powerpc ; do \
+	        for arch in $(ETCH_ARCHS) ; do \
 		  for archive in main contrib non-free ; do \
 		  $(PYTHON) bin/apt-update-file \
 		    $(MIRROR)/dists/$$rel/$$archive/binary-$$arch/Packages \
@@ -56,14 +59,10 @@ ST_FILE = data/packages/etch_security_
 update-testing-security:
 	$(PYTHON) bin/apt-update-file \
 	  $(ST_MIRROR)/main/source/Sources $(ST_FILE)main_Sources
-	$(PYTHON) bin/apt-update-file \
-	  $(ST_MIRROR)/main/binary-i386/Packages $(ST_FILE)main_i386_Packages
-	$(PYTHON) bin/apt-update-file \
-	  $(ST_MIRROR)/main/binary-ia64/Packages $(ST_FILE)main_ia64_Packages
-	$(PYTHON) bin/apt-update-file \
-	  $(ST_MIRROR)/main/binary-alpha/Packages $(ST_FILE)main_alpha_Packages
-	$(PYTHON) bin/apt-update-file \
-	  $(ST_MIRROR)/main/binary-powerpc/Packages $(ST_FILE)main_powerpc_Packages
+	set -e ; for arch in $(ETCH_ARCHS) ; do \
+	  $(PYTHON) bin/apt-update-file \
+	    $(ST_MIRROR)/main/binary-$${arch}/Packages $(ST_FILE)main_$${arch}_Packages ; \
+	  done
 
 SEC_MIRROR = http://security.debian.org/dists
 update-security:
@@ -71,9 +70,21 @@ update-security:
 	  $(PYTHON) bin/apt-update-file \
 	    $(SEC_MIRROR)/$$archive/updates/main/source/Sources \
 	    data/packages/$${archive}_security_main_Sources ; \
-	  for arch in i386 ia64 alpha powerpc ; do \
+	  for arch in $(ETCH_ARCHS) ; do \
 	    $(PYTHON) bin/apt-update-file \
 	      $(SEC_MIRROR)/$$archive/updates/main/binary-$$arch/Packages \
 	      data/packages/$${archive}_security_main_$${arch}_Packages ; \
 	  done ; \
 	done
+
+VOLATILE_MIRROR = http://volatile.debian.net/debian-volatile/dists
+update-volatile:
+	set -e && for arch in $(ETCH_ARCHS) ; do \
+	    $(PYTHON) bin/apt-update-file \
+	      $(VOLATILE_MIRROR)/sarge/volatile/main/binary-$$arch/Packages \
+	      data/packages/sarge_volatile_main_$${arch}_Packages ; \
+	  done
+	$(PYTHON) bin/apt-update-file \
+	      $(VOLATILE_MIRROR)/sarge/volatile/main/source/Sources \
+	      data/packages/sarge_volatile_main_Sources
+