[PATCH 6/7] Update the cross compile example configurations
---
cross/{armel.conf => armel-gcc4.4.conf} | 2 +-
cross/armel.conf | 15 +++++++++-----
cross/crosschroot-stable.conf | 21 ++++++--------------
cross/crosschroot-testing.conf | 19 +++++-------------
...{crosschroot.conf => crosschroot-unstable.conf} | 19 +++++-------------
cross/crosschroot.conf | 8 ++++----
cross/{mips.conf => mips-gcc4.4.conf} | 2 +-
cross/mips.conf | 15 +++++++++-----
cross/{mipsel.conf => mipsel-gcc4.4.conf} | 2 +-
cross/mipsel.conf | 15 +++++++++-----
cross/{powerpc.conf => powerpc-gcc4.4.conf} | 2 +-
cross/powerpc.conf | 17 ++++++++++------
cross/{sparc.conf => sparc-gcc4.4.conf} | 4 ++--
cross/sparc.conf | 15 +++++++++-----
14 filer ändrade, 77 tillägg(+), 79 borttagningar(-)
copy cross/{armel.conf => armel-gcc4.4.conf} (97%)
copy cross/{crosschroot.conf => crosschroot-unstable.conf} (59%)
copy cross/{mips.conf => mips-gcc4.4.conf} (97%)
copy cross/{mipsel.conf => mipsel-gcc4.4.conf} (97%)
copy cross/{powerpc.conf => powerpc-gcc4.4.conf} (97%)
copy cross/{sparc.conf => sparc-gcc4.4.conf} (85%)
diff --git a/cross/armel.conf b/cross/armel-gcc4.4.conf
similarity index 97%
copy from cross/armel.conf
copy to cross/armel-gcc4.4.conf
index 031e942f..324cfbc2 100644
--- a/cross/armel.conf
+++ b/cross/armel-gcc4.4.conf
@@ -18,5 +18,5 @@ suite=squeeze
packages=
source=http://cdn.debian.net/debian
keyring=debian-archive-keyring
-suite=unstable
+suite=stable
architecture=armel
diff --git a/cross/armel.conf b/cross/armel.conf
index 031e942f..b70ac8b2 100644
--- a/cross/armel.conf
+++ b/cross/armel.conf
@@ -1,18 +1,23 @@
+# Example multistrap configuration file for an armel cross-compile chroot
+#
+# To set up a build chroot for stable or testing instead of
+# unstable, just change General::include and Foreign::suit
+# to reference stable or testing instead of unstable.
+
[General]
-include=/usr/share/multistrap/crosschroot.conf
+include=/usr/share/multistrap/crosschroot-unstable.conf
omitrequired=false
configscript=
setupscript=/usr/share/multistrap/setcrossarch.sh
-bootstrap=Debian Base Toolchains
+bootstrap=Debian Toolchains
aptsources=Debian Toolchains Foreign
tarballname=pdebuild-cross.tgz
[Toolchains]
-packages=g++-4.4-arm-linux-gnueabi linux-libc-dev-armel-cross
-reinstall=binutils-multiarch
+packages=g++-4.7-arm-linux-gnueabi linux-libc-dev-armel-cross
source=http://www.emdebian.org/debian
keyring=emdebian-archive-keyring
-suite=squeeze
+suite=wheezy
[Foreign]
packages=
diff --git a/cross/crosschroot-stable.conf b/cross/crosschroot-stable.conf
index 53915b2d..e73db722 100644
--- a/cross/crosschroot-stable.conf
+++ b/cross/crosschroot-stable.conf
@@ -1,5 +1,4 @@
-# Example multistrap configuration file for a lenny build chroot
-# Need to use cascading to select the toolchain for the cross arch.
+# Base multistrap configuration file for a wheezy cross-compile chroot
[General]
arch=
@@ -18,20 +17,12 @@ unpack=true
# the order of sections is not important.
# the bootstrap option determines which repository
# is used to calculate the list of Priority: required packages.
-bootstrap=Base Build
-aptsources=Base Build
+bootstrap=Debian
+aptsources=Debian
-# Squeeze toolchains need -base from Squeeze.
-[Base]
-packages=gcc-4.4-base
+[Debian]
+packages=apt dpkg-dev dpkg-cross binutils-multiarch build-essential
source=http://cdn.debian.net/debian
keyring=debian-archive-keyring
-suite=squeeze
-omitdebsrc=false
-
-[Build]
-packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude
-source=http://cdn.debian.net/debian
-keyring=debian-archive-keyring
-suite=squeeze
+suite=stable
omitdebsrc=false
diff --git a/cross/crosschroot-testing.conf b/cross/crosschroot-testing.conf
index 90ca4dbd..1f6faa5d 100644
--- a/cross/crosschroot-testing.conf
+++ b/cross/crosschroot-testing.conf
@@ -1,5 +1,4 @@
-# Example multistrap configuration file for a squeeze build chroot
-# Need to use cascading to select the toolchain for a cross arch.
+# Base multistrap configuration file for a jessie cross-compile chroot
[General]
arch=
@@ -12,25 +11,17 @@ cleanup=true
noauth=false
# whether to add the /suite to be explicit about where apt
# needs to look for packages. Default is false.
-explicitsuite=true
+explicitsuite=false
# extract all downloaded archives (default is true)
unpack=true
# the order of sections is not important.
# the bootstrap option determines which repository
# is used to calculate the list of Priority: required packages.
-bootstrap=Debian Base
-aptsources=Debian Base
-
-# Squeeze toolchains need -base from Squeeze.
-[Base]
-packages=gcc-4.4-base
-source=http://cdn.debian.net/debian
-keyring=debian-archive-keyring
-suite=squeeze
-omitdebsrc=false
+bootstrap=Debian
+aptsources=Debian
[Debian]
-packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude
+packages=apt dpkg-dev dpkg-cross binutils-multiarch build-essential
source=http://cdn.debian.net/debian
keyring=debian-archive-keyring
suite=testing
diff --git a/cross/crosschroot.conf b/cross/crosschroot-unstable.conf
similarity index 59%
copy from cross/crosschroot.conf
copy to cross/crosschroot-unstable.conf
index e62a6f7b..8dfc0c3e 100644
--- a/cross/crosschroot.conf
+++ b/cross/crosschroot-unstable.conf
@@ -1,5 +1,4 @@
-# Example multistrap configuration file for a sid build chroot
-# Need to use cascading to select the toolchain for a cross arch.
+# Base multistrap configuration file for a sid cross-compile chroot
[General]
arch=
@@ -12,25 +11,17 @@ cleanup=true
noauth=false
# whether to add the /suite to be explicit about where apt
# needs to look for packages. Default is false.
-explicitsuite=true
+explicitsuite=false
# extract all downloaded archives (default is true)
unpack=true
# the order of sections is not important.
# the bootstrap option determines which repository
# is used to calculate the list of Priority: required packages.
-bootstrap=Debian Base
-aptsources=Debian Base
-
-# Squeeze toolchains need -base from Squeeze.
-[Base]
-packages=gcc-4.4-base
-source=http://cdn.debian.net/debian
-keyring=debian-archive-keyring
-suite=squeeze
-omitdebsrc=false
+bootstrap=Debian
+aptsources=Debian
[Debian]
-packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude
+packages=apt dpkg-dev dpkg-cross binutils-multiarch build-essential
source=http://cdn.debian.net/debian
keyring=debian-archive-keyring
suite=unstable
diff --git a/cross/crosschroot.conf b/cross/crosschroot.conf
index e62a6f7b..0f0b1fb0 100644
--- a/cross/crosschroot.conf
+++ b/cross/crosschroot.conf
@@ -1,5 +1,5 @@
-# Example multistrap configuration file for a sid build chroot
-# Need to use cascading to select the toolchain for a cross arch.
+# Base multistrap configuration file for a wheezy cross-compile chroot
+# with a gcc-4.4 crosscompiler from squeeze
[General]
arch=
@@ -30,8 +30,8 @@ suite=squeeze
omitdebsrc=false
[Debian]
-packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude
+packages=apt dpkg-dev dpkg-cross binutils-multiarch build-essential
source=http://cdn.debian.net/debian
keyring=debian-archive-keyring
-suite=unstable
+suite=stable
omitdebsrc=false
diff --git a/cross/mips.conf b/cross/mips-gcc4.4.conf
similarity index 97%
copy from cross/mips.conf
copy to cross/mips-gcc4.4.conf
index 58d824a1..8cab8c34 100644
--- a/cross/mips.conf
+++ b/cross/mips-gcc4.4.conf
@@ -18,5 +18,5 @@ suite=squeeze
packages=
source=http://cdn.debian.net/debian
keyring=debian-archive-keyring
-suite=unstable
+suite=stable
architecture=mips
diff --git a/cross/mips.conf b/cross/mips.conf
index 58d824a1..a46880b7 100644
--- a/cross/mips.conf
+++ b/cross/mips.conf
@@ -1,18 +1,23 @@
+# Example multistrap configuration file for a mips cross-compile chroot
+#
+# To set up a build chroot for stable or testing instead of
+# unstable, just change General::include and Foreign::suit
+# to reference stable or testing instead of unstable.
+
[General]
-include=/usr/share/multistrap/crosschroot.conf
+include=/usr/share/multistrap/crosschroot-unstable.conf
omitrequired=false
configscript=
setupscript=/usr/share/multistrap/setcrossarch.sh
-bootstrap=Debian Base Toolchains
+bootstrap=Debian Toolchains
aptsources=Debian Toolchains Foreign
tarballname=pdebuild-cross.tgz
[Toolchains]
-packages=g++-4.4-mips-linux-gnu linux-libc-dev-mips-cross
-reinstall=binutils-multiarch
+packages=g++-4.7-mips-linux-gnu linux-libc-dev-mips-cross
source=http://www.emdebian.org/debian
keyring=emdebian-archive-keyring
-suite=squeeze
+suite=wheezy
[Foreign]
packages=
diff --git a/cross/mipsel.conf b/cross/mipsel-gcc4.4.conf
similarity index 97%
copy from cross/mipsel.conf
copy to cross/mipsel-gcc4.4.conf
index 71db3097..a067c91f 100644
--- a/cross/mipsel.conf
+++ b/cross/mipsel-gcc4.4.conf
@@ -18,5 +18,5 @@ suite=squeeze
packages=
source=http://cdn.debian.net/debian
keyring=debian-archive-keyring
-suite=unstable
+suite=stable
architecture=mipsel
diff --git a/cross/mipsel.conf b/cross/mipsel.conf
index 71db3097..8b488b2f 100644
--- a/cross/mipsel.conf
+++ b/cross/mipsel.conf
@@ -1,18 +1,23 @@
+# Example multistrap configuration file for a mipsel cross-compile chroot
+#
+# To set up a build chroot for stable or testing instead of
+# unstable, just change General::include and Foreign::suit
+# to reference stable or testing instead of unstable.
+
[General]
-include=/usr/share/multistrap/crosschroot.conf
+include=/usr/share/multistrap/crosschroot-unstable.conf
omitrequired=false
configscript=
setupscript=/usr/share/multistrap/setcrossarch.sh
-bootstrap=Debian Base Toolchains
+bootstrap=Debian Toolchains
aptsources=Debian Toolchains Foreign
tarballname=pdebuild-cross.tgz
[Toolchains]
-packages=g++-4.4-mipsel-linux-gnu linux-libc-dev-mipsel-cross
-reinstall=binutils-multiarch
+packages=g++-4.7-mipsel-linux-gnu linux-libc-dev-mipsel-cross
source=http://www.emdebian.org/debian
keyring=emdebian-archive-keyring
-suite=squeeze
+suite=wheezy
[Foreign]
packages=
diff --git a/cross/powerpc.conf b/cross/powerpc-gcc4.4.conf
similarity index 97%
copy from cross/powerpc.conf
copy to cross/powerpc-gcc4.4.conf
index 655f129d..5274547e 100644
--- a/cross/powerpc.conf
+++ b/cross/powerpc-gcc4.4.conf
@@ -18,5 +18,5 @@ suite=squeeze
packages=
source=http://cdn.debian.net/debian
keyring=debian-archive-keyring
-suite=unstable
+suite=stable
architecture=powerpc
diff --git a/cross/powerpc.conf b/cross/powerpc.conf
index 655f129d..441c9033 100644
--- a/cross/powerpc.conf
+++ b/cross/powerpc.conf
@@ -1,22 +1,27 @@
+# Example multistrap configuration file for a powerpc cross-compile chroot
+#
+# To set up a build chroot for stable or testing instead of
+# unstable, just change General::include and Foreign::suit
+# to reference stable or testing instead of unstable.
+
[General]
-include=/usr/share/multistrap/crosschroot.conf
+include=/usr/share/multistrap/crosschroot-unstable.conf
omitrequired=false
configscript=
setupscript=/usr/share/multistrap/setcrossarch.sh
-bootstrap=Debian Base Toolchains
+bootstrap=Debian Toolchains
aptsources=Debian Toolchains Foreign
tarballname=pdebuild-cross.tgz
[Toolchains]
-packages=g++-4.4-powerpc-linux-gnu linux-libc-dev-powerpc-cross
-reinstall=binutils-multiarch
+packages=g++-4.7-powerpc-linux-gnu linux-libc-dev-powerpc-cross
source=http://www.emdebian.org/debian
keyring=emdebian-archive-keyring
-suite=squeeze
+suite=wheezy
[Foreign]
packages=
source=http://cdn.debian.net/debian
keyring=debian-archive-keyring
-suite=unstable
+suite=stable
architecture=powerpc
diff --git a/cross/sparc.conf b/cross/sparc-gcc4.4.conf
similarity index 85%
copy from cross/sparc.conf
copy to cross/sparc-gcc4.4.conf
index 6db0eda4..5afb979d 100644
--- a/cross/sparc.conf
+++ b/cross/sparc-gcc4.4.conf
@@ -8,7 +8,7 @@ aptsources=Debian Toolchains Foreign
tarballname=pdebuild-cross.tgz
[Toolchains]
-packages=g++-4.4-sparc-linux-gnue linux-libc-dev-sparc-cross
+packages=g++-4.4-sparc-linux-gnu linux-libc-dev-sparc-cross
reinstall=binutils-multiarch
source=http://www.emdebian.org/debian
keyring=emdebian-archive-keyring
@@ -18,5 +18,5 @@ suite=squeeze
packages=
source=http://cdn.debian.net/debian
keyring=debian-archive-keyring
-suite=unstable
+suite=stable
architecture=sparc
diff --git a/cross/sparc.conf b/cross/sparc.conf
index 6db0eda4..91624cc7 100644
--- a/cross/sparc.conf
+++ b/cross/sparc.conf
@@ -1,18 +1,23 @@
+# Example multistrap configuration file for a sparc cross-compile chroot
+#
+# To set up a build chroot for stable or testing instead of
+# unstable, just change General::include and Foreign::suit
+# to reference stable or testing instead of unstable.
+
[General]
-include=/usr/share/multistrap/crosschroot.conf
+include=/usr/share/multistrap/crosschroot-unstable.conf
omitrequired=false
configscript=
setupscript=
-bootstrap=Debian Base Toolchains
+bootstrap=Debian Toolchains
aptsources=Debian Toolchains Foreign
tarballname=pdebuild-cross.tgz
[Toolchains]
-packages=g++-4.4-sparc-linux-gnue linux-libc-dev-sparc-cross
-reinstall=binutils-multiarch
+packages=g++-4.7-sparc-linux-gnu linux-libc-dev-sparc-cross
source=http://www.emdebian.org/debian
keyring=emdebian-archive-keyring
-suite=squeeze
+suite=wheezy
[Foreign]
packages=
--
1.7.10.4
Reply to: