[Emdebian-logs] [SCM] Root filesystem generation tool (multistrap wrapper) branch, master, updated. 36b15b89f2b4c5a577330957252f98a5ce01ff13

[josch]

The following commit has been merged in the master branch:
commit 2f9b465ce024af2cb89ca4cc414a8e6457210e0c
Author: josch <josch at pyneo.org>
Date:   Tue Mar 13 15:56:16 2012 +0100

    armhf is now in the main archives

diff --git a/goldel-gta04/config b/goldel-gta04/config
index 8353fd0..81780c9 100644
--- a/goldel-gta04/config
+++ b/goldel-gta04/config
@@ -1,4 +1,4 @@
 SUITE="sid"
 ARCH="armhf"
 ROOTDIR="debian-$SUITE-$ARCH-`date +%F`"
-MIRROR="http://ftp.debian-ports.org/debian"
+MIRROR="http://cdn.debian.net/debian"
diff --git a/goldel-gta04/multistrap.conf b/goldel-gta04/multistrap.conf
index 514b46b..e914a7b 100644
--- a/goldel-gta04/multistrap.conf
+++ b/goldel-gta04/multistrap.conf
@@ -4,29 +4,19 @@ directory=$ROOTDIR
 cleanup=true
 unpack=true
 noauth=true
-bootstrap=Debian_bootstrap Debian_unreleased
-aptsources=Debian_apt Debian_apt_unreleased
+bootstrap=Debian_bootstrap
+aptsources=Debian
 allowrecommends=false
 addimportant=false
 
 [Debian_bootstrap]
-packages=debian-ports-archive-keyring $PACKAGES
-source=$MIRROR
-suite=$SUITE
-omitdebsrc=true
-
-[Debian_unreleased]
 packages=$PACKAGES
 source=$MIRROR
-suite=unreleased
-omitdebsrc=true
-
-[Debian_apt]
-source=http://ftp.debian-ports.org/debian
 suite=$SUITE
 omitdebsrc=true
 
-[Debian_apt_unreleased]
-source=http://ftp.debian-ports.org/debian
-suite=unreleased
+[Debian]
+source=http://cdn.debian.net/debian
+keyring=debian-archive-keyring
+suite=$SUITE
 omitdebsrc=true
diff --git a/notioninkadam/config b/notioninkadam/config
index 8353fd0..81780c9 100644
--- a/notioninkadam/config
+++ b/notioninkadam/config
@@ -1,4 +1,4 @@
 SUITE="sid"
 ARCH="armhf"
 ROOTDIR="debian-$SUITE-$ARCH-`date +%F`"
-MIRROR="http://ftp.debian-ports.org/debian"
+MIRROR="http://cdn.debian.net/debian"
diff --git a/notioninkadam/multistrap.conf b/notioninkadam/multistrap.conf
index 514b46b..fd42c53 100644
--- a/notioninkadam/multistrap.conf
+++ b/notioninkadam/multistrap.conf
@@ -4,29 +4,19 @@ directory=$ROOTDIR
 cleanup=true
 unpack=true
 noauth=true
-bootstrap=Debian_bootstrap Debian_unreleased
-aptsources=Debian_apt Debian_apt_unreleased
+bootstrap=Debian_bootstrap
+aptsources=Debian_apt
 allowrecommends=false
 addimportant=false
 
 [Debian_bootstrap]
-packages=debian-ports-archive-keyring $PACKAGES
-source=$MIRROR
-suite=$SUITE
-omitdebsrc=true
-
-[Debian_unreleased]
 packages=$PACKAGES
 source=$MIRROR
-suite=unreleased
+suite=$SUITE
 omitdebsrc=true
 
 [Debian_apt]
-source=http://ftp.debian-ports.org/debian
+source=http://cdn.debian.net/debian
+keyring=debian-archive-keyring
 suite=$SUITE
 omitdebsrc=true
-
-[Debian_apt_unreleased]
-source=http://ftp.debian-ports.org/debian
-suite=unreleased
-omitdebsrc=true

-- 
Root filesystem generation tool (multistrap wrapper)