From e53cca1e875f56b06f3973840549f36c80ea302b Mon Sep 17 00:00:00 2001 From: codehelp Date: Fri, 1 Apr 2011 19:18:41 +0000 Subject: [PATCH] Update config files for build and cross chroot (Closes: #610631) git-svn-id: http://emdebian.org/svn/current@7967 563faec7-e20c-0410-992a-a66f704d0ccd --- cross/armel.conf | 2 +- cross/buildchroot-stable.conf | 3 +-- cross/buildchroot-testing.conf | 2 +- cross/buildchroot.conf | 1 - cross/crosschroot-stable.conf | 13 ++++++++++--- cross/crosschroot-testing.conf | 7 +++---- cross/crosschroot.conf | 5 ++--- cross/hppa.conf | 2 +- cross/ia64.conf | 2 +- cross/mips.conf | 2 +- cross/mipsel.conf | 2 +- cross/powerpc.conf | 2 +- cross/sparc.conf | 2 +- debian/changelog | 3 ++- 14 files changed, 26 insertions(+), 22 deletions(-) diff --git a/cross/armel.conf b/cross/armel.conf index 6582b99..a9429f9 100644 --- a/cross/armel.conf +++ b/cross/armel.conf @@ -12,4 +12,4 @@ packages=g++-4.2-arm-linux-gnueabi linux-libc-dev-armel-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=stable +suite=lenny diff --git a/cross/buildchroot-stable.conf b/cross/buildchroot-stable.conf index 978d1be..fc67874 100644 --- a/cross/buildchroot-stable.conf +++ b/cross/buildchroot-stable.conf @@ -21,9 +21,8 @@ unpack=true debootstrap=Base aptsources=Base -# Lenny toolchains need -base from Lenny. [Base] -packages=gcc-4.2-base dpkg-dev binutils-multiarch +packages=apt build-essential fakeroot source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=stable diff --git a/cross/buildchroot-testing.conf b/cross/buildchroot-testing.conf index 8c0a5b6..a0ab73c 100644 --- a/cross/buildchroot-testing.conf +++ b/cross/buildchroot-testing.conf @@ -22,7 +22,7 @@ debootstrap=Debian aptsources=Debian [Debian] -packages=dpkg-dev binutils-multiarch +packages=apt build-essential fakeroot source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=testing diff --git a/cross/buildchroot.conf b/cross/buildchroot.conf index 4fe7bfd..4a882ec 100644 --- a/cross/buildchroot.conf +++ b/cross/buildchroot.conf @@ -20,7 +20,6 @@ unpack=true debootstrap=Debian aptsources=Debian -# this is a duplicate if the suite is the same as the toolchain. [Debian] packages=apt build-essential fakeroot source=http://ftp.uk.debian.org/debian diff --git a/cross/crosschroot-stable.conf b/cross/crosschroot-stable.conf index de65f0d..218a17c 100644 --- a/cross/crosschroot-stable.conf +++ b/cross/crosschroot-stable.conf @@ -18,12 +18,19 @@ 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=Base -aptsources=Base +debootstrap=Base Build +aptsources=Base Build # Lenny toolchains need -base from Lenny. [Base] -packages=gcc-4.2-base dpkg-dev binutils-multiarch build-essential aptitude +packages=gcc-4.2-base +source=http://ftp.uk.debian.org/debian +keyring=debian-archive-keyring +suite=lenny +omitdebsrc=false + +[Build] +packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=stable diff --git a/cross/crosschroot-testing.conf b/cross/crosschroot-testing.conf index 58a07cd..3c9f3e3 100644 --- a/cross/crosschroot-testing.conf +++ b/cross/crosschroot-testing.conf @@ -19,19 +19,18 @@ unpack=true # the debootstrap option determines which repository # is used to calculate the list of Priority: required packages. debootstrap=Debian Base -aptsources=Debian +aptsources=Debian Base # Lenny toolchains need -base from Lenny. [Base] packages=gcc-4.2-base source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring -suite=stable +suite=lenny omitdebsrc=false -# this is a duplicate if the suite is the same as the toolchain. [Debian] -packages=dpkg-dev binutils-multiarch build-essential aptitude +packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=testing diff --git a/cross/crosschroot.conf b/cross/crosschroot.conf index ceb2370..db1928f 100644 --- a/cross/crosschroot.conf +++ b/cross/crosschroot.conf @@ -19,17 +19,16 @@ unpack=true # the debootstrap option determines which repository # is used to calculate the list of Priority: required packages. debootstrap=Debian Base -aptsources=Debian +aptsources=Debian Base # Lenny toolchains need -base from Lenny. [Base] packages=gcc-4.2-base source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring -suite=stable +suite=lenny omitdebsrc=false -# this is a duplicate if the suite is the same as the toolchain. [Debian] packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude source=http://ftp.uk.debian.org/debian diff --git a/cross/hppa.conf b/cross/hppa.conf index 418d7ce..9cf56f2 100644 --- a/cross/hppa.conf +++ b/cross/hppa.conf @@ -12,4 +12,4 @@ packages=g++-4.2-hppa-linux-gnu linux-libc-dev-hppa-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=stable +suite=lenny diff --git a/cross/ia64.conf b/cross/ia64.conf index dcb7a2e..db9c602 100644 --- a/cross/ia64.conf +++ b/cross/ia64.conf @@ -12,4 +12,4 @@ packages=g++-4.2-ia64-linux-gnu linux-libc-dev-ia64-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=stable +suite=lenny diff --git a/cross/mips.conf b/cross/mips.conf index f5cde2e..68158a7 100644 --- a/cross/mips.conf +++ b/cross/mips.conf @@ -12,4 +12,4 @@ packages=g++-4.2-mips-linux-gnu linux-libc-dev-mips-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=stable +suite=lenny diff --git a/cross/mipsel.conf b/cross/mipsel.conf index 0460acc..e953b6a 100644 --- a/cross/mipsel.conf +++ b/cross/mipsel.conf @@ -12,4 +12,4 @@ packages=g++-4.2-mipsel-linux-gnu linux-libc-dev-mipsel-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=stable +suite=lenny diff --git a/cross/powerpc.conf b/cross/powerpc.conf index f89d00d..5d9dec8 100644 --- a/cross/powerpc.conf +++ b/cross/powerpc.conf @@ -12,4 +12,4 @@ packages=g++-4.2-powerpc-linux-gnu linux-libc-dev-powerpc-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=stable +suite=lenny diff --git a/cross/sparc.conf b/cross/sparc.conf index ceef0a9..d43df36 100644 --- a/cross/sparc.conf +++ b/cross/sparc.conf @@ -12,4 +12,4 @@ packages=g++-4.2-sparc-linux-gnue linux-libc-dev-sparc-cross reinstall=binutils-multiarch source=http://www.emdebian.org/debian keyring=emdebian-archive-keyring -suite=stable +suite=lenny diff --git a/debian/changelog b/debian/changelog index 57d085e..519183e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,9 @@ multistrap (2.1.13) unstable; urgency=low * Improve source download method to get packages individually - avoids breakage if the repository is incomplete. * Complete the support for 'flat' repositories (Closes: #619959) + * Update config files for build and cross chroot (Closes: #610631) - -- Neil Williams Thu, 31 Mar 2011 16:42:34 +0100 + -- Neil Williams Fri, 01 Apr 2011 20:15:06 +0100 multistrap (2.1.12) unstable; urgency=low