diff --git a/cross/alpha.conf b/cross/alpha.conf index d24f0ce..5bde551 100644 --- a/cross/alpha.conf +++ b/cross/alpha.conf @@ -8,8 +8,8 @@ aptsources=Debian Toolchains tarballname=pdebuild-cross.tgz [Toolchains] -packages=g++-4.2-alpha-linux-gnu linux-libc-dev-alpha-cross +packages=g++-4.4-alpha-linux-gnu linux-libc-dev-alpha-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=stable +suite=squeeze diff --git a/cross/arm.conf b/cross/arm.conf deleted file mode 100644 index 21de52a..0000000 --- a/cross/arm.conf +++ /dev/null @@ -1,11 +0,0 @@ -[General] -include=/usr/share/multistrap/crosschroot.conf -omitrequired=false -configscript=config.sh -setupscript=setup.sh - -[Toolchains] -packages=g++-4.2-arm-linux-gnu linux-libc-dev-arm-cross -source=http://www.emdebian.org/debian -keyring=emdebian-archive-keyring -suite=stable diff --git a/cross/armel.conf b/cross/armel.conf index a9429f9..3501362 100644 --- a/cross/armel.conf +++ b/cross/armel.conf @@ -8,8 +8,8 @@ aptsources=Debian Toolchains tarballname=pdebuild-cross.tgz [Toolchains] -packages=g++-4.2-arm-linux-gnueabi linux-libc-dev-armel-cross +packages=g++-4.4-arm-linux-gnueabi linux-libc-dev-armel-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=lenny +suite=squeeze diff --git a/cross/buildchroot-stable.conf b/cross/buildchroot-stable.conf index fc67874..cdb2497 100644 --- a/cross/buildchroot-stable.conf +++ b/cross/buildchroot-stable.conf @@ -23,7 +23,7 @@ aptsources=Base [Base] packages=apt build-essential fakeroot -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=stable omitdebsrc=false diff --git a/cross/buildchroot-testing.conf b/cross/buildchroot-testing.conf index a0ab73c..64fdbf1 100644 --- a/cross/buildchroot-testing.conf +++ b/cross/buildchroot-testing.conf @@ -23,7 +23,7 @@ aptsources=Debian [Debian] packages=apt build-essential fakeroot -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=testing omitdebsrc=false diff --git a/cross/buildchroot.conf b/cross/buildchroot.conf index 4a882ec..7ab9609 100644 --- a/cross/buildchroot.conf +++ b/cross/buildchroot.conf @@ -22,7 +22,7 @@ aptsources=Debian [Debian] packages=apt build-essential fakeroot -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=unstable omitdebsrc=false diff --git a/cross/crosschroot-stable.conf b/cross/crosschroot-stable.conf index 218a17c..3f18746 100644 --- a/cross/crosschroot-stable.conf +++ b/cross/crosschroot-stable.conf @@ -21,17 +21,17 @@ unpack=true debootstrap=Base Build aptsources=Base Build -# Lenny toolchains need -base from Lenny. +# Squeeze toolchains need -base from Squeeze. [Base] -packages=gcc-4.2-base -source=http://ftp.uk.debian.org/debian +packages=gcc-4.4-base +source=http://cdn.debian.net/debian keyring=debian-archive-keyring -suite=lenny +suite=squeeze omitdebsrc=false [Build] packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring -suite=stable +suite=squeeze omitdebsrc=false diff --git a/cross/crosschroot-testing.conf b/cross/crosschroot-testing.conf index 3c9f3e3..dd3e711 100644 --- a/cross/crosschroot-testing.conf +++ b/cross/crosschroot-testing.conf @@ -21,17 +21,17 @@ unpack=true debootstrap=Debian Base aptsources=Debian Base -# Lenny toolchains need -base from Lenny. +# Squeeze toolchains need -base from Squeeze. [Base] -packages=gcc-4.2-base -source=http://ftp.uk.debian.org/debian +packages=gcc-4.4-base +source=http://cdn.debian.net/debian keyring=debian-archive-keyring -suite=lenny +suite=squeeze omitdebsrc=false [Debian] packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=testing omitdebsrc=false diff --git a/cross/crosschroot.conf b/cross/crosschroot.conf index db1928f..69d4a66 100644 --- a/cross/crosschroot.conf +++ b/cross/crosschroot.conf @@ -21,17 +21,17 @@ unpack=true debootstrap=Debian Base aptsources=Debian Base -# Lenny toolchains need -base from Lenny. +# Squeeze toolchains need -base from Squeeze. [Base] -packages=gcc-4.2-base -source=http://ftp.uk.debian.org/debian +packages=gcc-4.4-base +source=http://cdn.debian.net/debian keyring=debian-archive-keyring -suite=lenny +suite=squeeze omitdebsrc=false [Debian] packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=unstable omitdebsrc=false diff --git a/cross/hppa.conf b/cross/hppa.conf index 9cf56f2..c2fee17 100644 --- a/cross/hppa.conf +++ b/cross/hppa.conf @@ -8,8 +8,8 @@ aptsources=Debian Toolchains tarballname=pdebuild-cross.tgz [Toolchains] -packages=g++-4.2-hppa-linux-gnu linux-libc-dev-hppa-cross +packages=g++-4.4-hppa-linux-gnu linux-libc-dev-hppa-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=lenny +suite=squeeze diff --git a/cross/ia64.conf b/cross/ia64.conf index db9c602..e13af77 100644 --- a/cross/ia64.conf +++ b/cross/ia64.conf @@ -8,8 +8,8 @@ aptsources=Debian Toolchains tarballname=pdebuild-cross.tgz [Toolchains] -packages=g++-4.2-ia64-linux-gnu linux-libc-dev-ia64-cross +packages=g++-4.4-ia64-linux-gnu linux-libc-dev-ia64-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=lenny +suite=squeeze diff --git a/cross/mips.conf b/cross/mips.conf index 68158a7..a3e4664 100644 --- a/cross/mips.conf +++ b/cross/mips.conf @@ -8,8 +8,8 @@ aptsources=Debian Toolchains tarballname=pdebuild-cross.tgz [Toolchains] -packages=g++-4.2-mips-linux-gnu linux-libc-dev-mips-cross +packages=g++-4.4-mips-linux-gnu linux-libc-dev-mips-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=lenny +suite=squeeze diff --git a/cross/mipsel.conf b/cross/mipsel.conf index e953b6a..c830823 100644 --- a/cross/mipsel.conf +++ b/cross/mipsel.conf @@ -8,8 +8,8 @@ aptsources=Debian Toolchains tarballname=pdebuild-cross.tgz [Toolchains] -packages=g++-4.2-mipsel-linux-gnu linux-libc-dev-mipsel-cross +packages=g++-4.4-mipsel-linux-gnu linux-libc-dev-mipsel-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=lenny +suite=squeeze diff --git a/cross/powerpc.conf b/cross/powerpc.conf index 5d9dec8..4cc7e4f 100644 --- a/cross/powerpc.conf +++ b/cross/powerpc.conf @@ -8,8 +8,8 @@ aptsources=Debian Toolchains tarballname=pdebuild-cross.tgz [Toolchains] -packages=g++-4.2-powerpc-linux-gnu linux-libc-dev-powerpc-cross +packages=g++-4.4-powerpc-linux-gnu linux-libc-dev-powerpc-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=lenny +suite=squeeze diff --git a/cross/s390.conf b/cross/s390.conf index 418bfd9..2dfdbf1 100644 --- a/cross/s390.conf +++ b/cross/s390.conf @@ -8,8 +8,8 @@ aptsources=Debian Toolchains tarballname=pdebuild-cross.tgz [Toolchains] -packages=g++-4.2-s390-linux-gnue linux-libc-dev-s390-cross +packages=g++-4.4-s390-linux-gnue linux-libc-dev-s390-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=stable +suite=squeeze diff --git a/cross/sparc.conf b/cross/sparc.conf index d43df36..163611e 100644 --- a/cross/sparc.conf +++ b/cross/sparc.conf @@ -8,8 +8,8 @@ aptsources=Debian Toolchains tarballname=pdebuild-cross.tgz [Toolchains] -packages=g++-4.2-sparc-linux-gnue linux-libc-dev-sparc-cross +packages=g++-4.4-sparc-linux-gnue linux-libc-dev-sparc-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=lenny +suite=squeeze diff --git a/debian/changelog b/debian/changelog index 37402fd..c12a7ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ multistrap (2.1.18) experimental; urgency=low * Fix logic in dump_config for missing packages lines. (Closes: #669206) * Check values of the keyring hash. (Closes: #669205) + * Update pdebuild-cross conf files to get toolchains from Squeeze. - -- Neil Williams Wed, 18 Apr 2012 21:25:47 +0100 + -- Neil Williams Fri, 20 Apr 2012 20:01:30 +0100 multistrap (2.1.17) experimental; urgency=low diff --git a/examples/chroot.conf b/examples/chroot.conf index 234d13e..a96759d 100644 --- a/examples/chroot.conf +++ b/examples/chroot.conf @@ -25,6 +25,6 @@ aptsources=Debian [Debian] packages=apt -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=squeeze diff --git a/examples/full.conf b/examples/full.conf index f7a2ebe..8660609 100644 --- a/examples/full.conf +++ b/examples/full.conf @@ -43,7 +43,7 @@ debconfseed= hookdir= # multiarch architectures to enable (space separated list) # multiarch=i386 armel armhf -multiarch= +multiarch=amd64 armel # include variables from a more generic config file # include=path/to/general.conf include= @@ -57,15 +57,22 @@ unpack=true # the order of sections is not important. # the debootstrap option determines which repository # is used to calculate the list of Priority: required packages. -debootstrap=Debian +debootstrap=Debian Foreign aptsources=Debian [Debian] packages=apt -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=wheezy omitdebsrc=false additional= reinstall= components=main + +[Foreign] +packages=libgcc1 libc6 +architecture=armel +source=http://cdn.debian.net/debian +keyring=debian-archive-keyring +suite=sid diff --git a/examples/multiarch.conf b/examples/multiarch.conf index badd6cd..8d802f1 100644 --- a/examples/multiarch.conf +++ b/examples/multiarch.conf @@ -24,7 +24,7 @@ aptsources=Debian [Debian] packages=apt -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=wheezy @@ -32,7 +32,7 @@ suite=wheezy packages=libgcc1 packages=libc6 architecture=armel -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=wheezy diff --git a/examples/multistrap-example.conf b/examples/multistrap-example.conf index b99e771..ac0d0a7 100644 --- a/examples/multistrap-example.conf +++ b/examples/multistrap-example.conf @@ -23,7 +23,7 @@ aptsources=Debian [Debian] packages= -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=stable omitdebsrc=false diff --git a/examples/sid.conf b/examples/sid.conf index 99f2a3b..5d31830 100644 --- a/examples/sid.conf +++ b/examples/sid.conf @@ -22,6 +22,6 @@ aptsources=Debian [Debian] packages=apt -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=sid diff --git a/examples/squeeze.conf b/examples/squeeze.conf index 5503815..c11dd62 100644 --- a/examples/squeeze.conf +++ b/examples/squeeze.conf @@ -22,6 +22,6 @@ aptsources=Debian [Debian] packages=apt -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=squeeze diff --git a/examples/wheezy.conf b/examples/wheezy.conf index 5a61807..d04f590 100644 --- a/examples/wheezy.conf +++ b/examples/wheezy.conf @@ -22,6 +22,6 @@ aptsources=Debian [Debian] packages=apt -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=wheezy