From ab99270f61304de59c9058ca99aa67d6a45f3714 Mon Sep 17 00:00:00 2001 From: codehelp Date: Fri, 26 Jul 2013 08:51:24 +0000 Subject: [PATCH] freshen up a few of the cross examples git-svn-id: http://emdebian.org/svn/current@8460 563faec7-e20c-0410-992a-a66f704d0ccd --- cross/armel.conf | 2 +- cross/buildchroot-stable.conf | 6 +++--- cross/buildchroot-testing.conf | 6 +++--- cross/buildchroot.conf | 6 +++--- cross/crosschroot-stable.conf | 6 +++--- cross/crosschroot-testing.conf | 6 +++--- cross/crosschroot.conf | 6 +++--- cross/ia64.conf | 15 --------------- cross/mips.conf | 2 +- cross/mipsel.conf | 2 +- cross/powerpc.conf | 2 +- cross/s390.conf | 22 ---------------------- cross/sparc.conf | 2 +- 13 files changed, 23 insertions(+), 60 deletions(-) delete mode 100644 cross/ia64.conf delete mode 100644 cross/s390.conf diff --git a/cross/armel.conf b/cross/armel.conf index 86baa8b..031e942 100644 --- a/cross/armel.conf +++ b/cross/armel.conf @@ -3,7 +3,7 @@ include=/usr/share/multistrap/crosschroot.conf omitrequired=false configscript= setupscript=/usr/share/multistrap/setcrossarch.sh -debootstrap=Debian Base Toolchains +bootstrap=Debian Base Toolchains aptsources=Debian Toolchains Foreign tarballname=pdebuild-cross.tgz diff --git a/cross/buildchroot-stable.conf b/cross/buildchroot-stable.conf index cdb2497..f8abaa0 100644 --- a/cross/buildchroot-stable.conf +++ b/cross/buildchroot-stable.conf @@ -7,7 +7,7 @@ directory= # same as --tidy-up option if set to true cleanup=true # same as --no-auth option if set to true -# keyring packages listed in each debootstrap will +# keyring packages listed in each bootstrap will # still be installed. noauth=false # whether to add the /suite to be explicit about where apt @@ -16,9 +16,9 @@ explicitsuite=false # extract all downloaded archives (default is true) unpack=true # the order of sections is not important. -# the debootstrap option determines which repository +# the bootstrap option determines which repository # is used to calculate the list of Priority: required packages. -debootstrap=Base +bootstrap=Base aptsources=Base [Base] diff --git a/cross/buildchroot-testing.conf b/cross/buildchroot-testing.conf index 64fdbf1..6289449 100644 --- a/cross/buildchroot-testing.conf +++ b/cross/buildchroot-testing.conf @@ -7,7 +7,7 @@ directory= # same as --tidy-up option if set to true cleanup=true # same as --no-auth option if set to true -# keyring packages listed in each debootstrap will +# keyring packages listed in each bootstrap will # still be installed. noauth=false # whether to add the /suite to be explicit about where apt @@ -16,9 +16,9 @@ explicitsuite=false # extract all downloaded archives (default is true) unpack=true # the order of sections is not important. -# the debootstrap option determines which repository +# the bootstrap option determines which repository # is used to calculate the list of Priority: required packages. -debootstrap=Debian +bootstrap=Debian aptsources=Debian [Debian] diff --git a/cross/buildchroot.conf b/cross/buildchroot.conf index 7ab9609..f824857 100644 --- a/cross/buildchroot.conf +++ b/cross/buildchroot.conf @@ -6,7 +6,7 @@ directory= # same as --tidy-up option if set to true cleanup=true # same as --no-auth option if set to true -# keyring packages listed in each debootstrap will +# keyring packages listed in each bootstrap will # still be installed. noauth=false # whether to add the /suite to be explicit about where apt @@ -15,9 +15,9 @@ explicitsuite=false # extract all downloaded archives (default is true) unpack=true # the order of sections is not important. -# the debootstrap option determines which repository +# the bootstrap option determines which repository # is used to calculate the list of Priority: required packages. -debootstrap=Debian +bootstrap=Debian aptsources=Debian [Debian] diff --git a/cross/crosschroot-stable.conf b/cross/crosschroot-stable.conf index 3f18746..53915b2 100644 --- a/cross/crosschroot-stable.conf +++ b/cross/crosschroot-stable.conf @@ -7,7 +7,7 @@ directory= # same as --tidy-up option if set to true cleanup=true # same as --no-auth option if set to true -# keyring packages listed in each debootstrap will +# keyring packages listed in each bootstrap will # still be installed. noauth=false # whether to add the /suite to be explicit about where apt @@ -16,9 +16,9 @@ explicitsuite=false # extract all downloaded archives (default is true) unpack=true # the order of sections is not important. -# the debootstrap option determines which repository +# the bootstrap option determines which repository # is used to calculate the list of Priority: required packages. -debootstrap=Base Build +bootstrap=Base Build aptsources=Base Build # Squeeze toolchains need -base from Squeeze. diff --git a/cross/crosschroot-testing.conf b/cross/crosschroot-testing.conf index dd3e711..90ca4db 100644 --- a/cross/crosschroot-testing.conf +++ b/cross/crosschroot-testing.conf @@ -7,7 +7,7 @@ directory= # same as --tidy-up option if set to true cleanup=true # same as --no-auth option if set to true -# keyring packages listed in each debootstrap will +# keyring packages listed in each bootstrap will # still be installed. noauth=false # whether to add the /suite to be explicit about where apt @@ -16,9 +16,9 @@ explicitsuite=true # extract all downloaded archives (default is true) unpack=true # the order of sections is not important. -# the debootstrap option determines which repository +# the bootstrap option determines which repository # is used to calculate the list of Priority: required packages. -debootstrap=Debian Base +bootstrap=Debian Base aptsources=Debian Base # Squeeze toolchains need -base from Squeeze. diff --git a/cross/crosschroot.conf b/cross/crosschroot.conf index 69d4a66..e62a6f7 100644 --- a/cross/crosschroot.conf +++ b/cross/crosschroot.conf @@ -7,7 +7,7 @@ directory= # same as --tidy-up option if set to true cleanup=true # same as --no-auth option if set to true -# keyring packages listed in each debootstrap will +# keyring packages listed in each bootstrap will # still be installed. noauth=false # whether to add the /suite to be explicit about where apt @@ -16,9 +16,9 @@ explicitsuite=true # extract all downloaded archives (default is true) unpack=true # the order of sections is not important. -# the debootstrap option determines which repository +# the bootstrap option determines which repository # is used to calculate the list of Priority: required packages. -debootstrap=Debian Base +bootstrap=Debian Base aptsources=Debian Base # Squeeze toolchains need -base from Squeeze. diff --git a/cross/ia64.conf b/cross/ia64.conf deleted file mode 100644 index e13af77..0000000 --- a/cross/ia64.conf +++ /dev/null @@ -1,15 +0,0 @@ -[General] -include=/usr/share/multistrap/crosschroot.conf -omitrequired=false -configscript= -setupscript= -debootstrap=Debian Base Toolchains -aptsources=Debian Toolchains -tarballname=pdebuild-cross.tgz - -[Toolchains] -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=squeeze diff --git a/cross/mips.conf b/cross/mips.conf index 001d9ec..58d824a 100644 --- a/cross/mips.conf +++ b/cross/mips.conf @@ -3,7 +3,7 @@ include=/usr/share/multistrap/crosschroot.conf omitrequired=false configscript= setupscript=/usr/share/multistrap/setcrossarch.sh -debootstrap=Debian Base Toolchains +bootstrap=Debian Base Toolchains aptsources=Debian Toolchains Foreign tarballname=pdebuild-cross.tgz diff --git a/cross/mipsel.conf b/cross/mipsel.conf index 7d371c6..71db309 100644 --- a/cross/mipsel.conf +++ b/cross/mipsel.conf @@ -3,7 +3,7 @@ include=/usr/share/multistrap/crosschroot.conf omitrequired=false configscript= setupscript=/usr/share/multistrap/setcrossarch.sh -debootstrap=Debian Base Toolchains +bootstrap=Debian Base Toolchains aptsources=Debian Toolchains Foreign tarballname=pdebuild-cross.tgz diff --git a/cross/powerpc.conf b/cross/powerpc.conf index c8c7f2f..655f129 100644 --- a/cross/powerpc.conf +++ b/cross/powerpc.conf @@ -3,7 +3,7 @@ include=/usr/share/multistrap/crosschroot.conf omitrequired=false configscript= setupscript=/usr/share/multistrap/setcrossarch.sh -debootstrap=Debian Base Toolchains +bootstrap=Debian Base Toolchains aptsources=Debian Toolchains Foreign tarballname=pdebuild-cross.tgz diff --git a/cross/s390.conf b/cross/s390.conf deleted file mode 100644 index dc24f8e..0000000 --- a/cross/s390.conf +++ /dev/null @@ -1,22 +0,0 @@ -[General] -include=/usr/share/multistrap/crosschroot.conf -omitrequired=false -configscript= -setupscript= -debootstrap=Debian Base Toolchains -aptsources=Debian Toolchains Foreign -tarballname=pdebuild-cross.tgz - -[Toolchains] -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=squeeze - -[Foreign] -packages= -source=http://cdn.debian.net/debian -keyring=debian-archive-keyring -suite=unstable -architecture=s390 diff --git a/cross/sparc.conf b/cross/sparc.conf index 57f0f38..6db0eda 100644 --- a/cross/sparc.conf +++ b/cross/sparc.conf @@ -3,7 +3,7 @@ include=/usr/share/multistrap/crosschroot.conf omitrequired=false configscript= setupscript= -debootstrap=Debian Base Toolchains +bootstrap=Debian Base Toolchains aptsources=Debian Toolchains Foreign tarballname=pdebuild-cross.tgz