freshen up a few of the cross examples

git-svn-id: http://emdebian.org/svn/current@8460 563faec7-e20c-0410-992a-a66f704d0ccd
11 years ago · ab99270f61
parent a94e562e88
commit ab99270f61
13 changed files with 23 additions and 60 deletions
--- 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

--- 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]
--- 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]
--- 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]
--- 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.
--- 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.
--- 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.
--- a/cross/ia64.conf
+++ b/cross/ia64.conf
@ -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
--- 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

--- 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

--- 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

--- a/cross/s390.conf
+++ b/cross/s390.conf
@ -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
--- 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