Add armel as architecture and rename kfreebsd archive to gnuab

Since the same archive hosts now armel and the two kfreebsd
architectures, rename to a more generic name.

The porter remark in download.tmpl needs some adjusting still
but it is not terribly important, so leave it out of this commit.

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 70fd9f5eb8cedd165a6e1d5b125155ffcf25aef4..a31d32a9a5faf53718de96f46010f7af6b236b25 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -31,8 +31,7 @@ security_ftpsite=http://security.debian.org/debian-security
 volatile_ftpsite=http://volatile.debian.org/debian-volatile
 backports_ftpsite=http://backports.org/debian
 amd64_ftpsite=http://amd64.debian.net/debian
-#kfreebsd_ftpsite=http://kfreebsd-gnu.debian.net/debian
-kfreebsd_ftpsite=http://ftp.de.debian.org/debian-kfreebsd
+gnuab_ftpsite=http://kfreebsd-gnu.debian.net/debian
 
 root=""
 
@@ -40,17 +39,17 @@ root=""
 #
 polangs="de fi nl fr uk"
 ddtplangs="de cs da eo es fi fr hu it ja nl pl pt_BR pt_PT ru sk sv_SE uk"
-archives="us security amd64 kfreebsd backports volatile"
+archives="us security amd64 gnuab backports volatile"
 sections="main contrib non-free"
 parts="$sections"
 suites="oldstable oldstable-volatile oldstable-backports stable stable-volatile stable-backports testing unstable experimental"
 priorities="required important standard optional extra"
 dists="$suites"
-architectures="alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
+architectures="alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
 arch_oldstable="alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
 arch_stable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
 arch_testing="${arch_stable}"
-arch_unstable="${arch_oldstable} hurd-i386 kfreebsd-i386 kfreebsd-amd64"
+arch_unstable="${arch_oldstable} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64"
 arch_experimental="${arch_unstable}"
 arch_testing_proposed_updates="${arch_testing}"
 arch_stable_proposed_updates="${arch_stable}"

diff --git a/cron.d/100syncarchive_gnuab b/cron.d/100syncarchive_gnuab
new file mode 100755 (executable)
index 0000000..1295c63
--- /dev/null
+++ b/cron.d/100syncarchive_gnuab
@@ -0,0 +1,33 @@
+#! /bin/bash
+
+. `dirname $0`/../config.sh
+
+test -d ${archivedir} || mkdir -p ${archivedir}
+cd ${archivedir}
+
+# Main archive
+#
+architectures="armel kfreebsd-i386 kfreebsd-amd64"
+
+for dist in unstable experimental
+  do
+  echo "retrieve Release(.gpg) $dist"
+  test -d gnuab/${dist} || mkdir -p gnuab/${dist}
+  (cd gnuab/${dist} &&
+           wget -q -N ${gnuab_ftpsite}/dists/${dist}/Release &&
+           wget -q -N ${gnuab_ftpsite}/dists/${dist}/Release.gpg )
+
+  for arch in $architectures
+    do
+    for part in ${parts} main/debian-installer
+      do
+      echo retrieve Packages $dist/$part/$arch
+      test -d gnuab/${dist}/${part}/binary-${arch} || mkdir -p gnuab/${dist}/${part}/binary-${arch}
+      (cd gnuab/${dist}/${part}/binary-${arch} &&
+         wget -q -N ${gnuab_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
+    done
+    echo retrieve Contents $dist/$arch
+    (cd gnuab/${dist} &&
+       wget -q -N ${gnuab_ftpsite}/dists/${dist}/Contents-${arch}.gz)
+  done
+done

diff --git a/cron.d/100syncarchive_kfreebsd b/cron.d/100syncarchive_kfreebsd
deleted file mode 100755 (executable)
index 287b00a..0000000
--- a/cron.d/100syncarchive_kfreebsd
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/bash
-
-. `dirname $0`/../config.sh
-
-test -d ${archivedir} || mkdir -p ${archivedir}
-cd ${archivedir}
-
-# Main archive
-#
-architectures="kfreebsd-i386 kfreebsd-amd64"
-
-for dist in unstable experimental
-  do
-  echo "retrieve Release(.gpg) $dist"
-  test -d kfreebsd/${dist} || mkdir -p kfreebsd/${dist}
-  (cd kfreebsd/${dist} &&
-           wget -q -N ${kfreebsd_ftpsite}/dists/${dist}/Release &&
-           wget -q -N ${kfreebsd_ftpsite}/dists/${dist}/Release.gpg )
-
-  for arch in $architectures
-    do
-    for part in ${parts} main/debian-installer
-      do
-      echo retrieve Packages $dist/$part/$arch
-      test -d kfreebsd/${dist}/${part}/binary-${arch} || mkdir -p kfreebsd/${dist}/${part}/binary-${arch}
-      (cd kfreebsd/${dist}/${part}/binary-${arch} &&
-         wget -q -N ${kfreebsd_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
-    done
-    echo retrieve Contents $dist/$arch
-    (cd kfreebsd/${dist} &&
-       wget -q -N ${kfreebsd_ftpsite}/dists/${dist}/Contents-${arch}.gz)
-  done
-done

diff --git a/templates/config/architectures.tmpl b/templates/config/architectures.tmpl
index 94523fadb3ff87be17e1a1e1fe2fd19c4579c6ae..1eda3bbb5c3c225391db1597e6f20799e2f8005e 100644 (file)
--- a/templates/config/architectures.tmpl
+++ b/templates/config/architectures.tmpl
@@ -14,8 +14,9 @@ architectures = {
         s390    => 'IBM S/390',
        "hurd-i386" => 'Hurd (i386)',
        amd64   => 'AMD64',
+       armel   => 'EABI ARM',
        "kfreebsd-i386" => 'GNU/kFreeBSD (i386)',
        "kfreebsd-amd64" => 'GNU/kFreeBSD (amd64)'
 }
 
-%]
\ No newline at end of file
+%]

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index c9cc50e808ac1bd1f41c4f4ad515ed1cdd7381af..4457112ae87ab4e67d0b0b1abf11db6479007d3a 100644 (file)
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -140,7 +140,7 @@ mirrors = {
                ],
        },
 
-       kfreebsd => {
+       gnuab => {
                unofficial_port => {
                        url_name => 'kfreebsd-gnu',
                        name => 'GNU/kFreeBSD',