From 5a265f764ab377c40755826bb601311149250778 Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Sun, 3 May 2015 10:16:24 +0100 Subject: [PATCH] Drop old crossbuild support reliant on outdated support. --- cross/armel.conf | 22 ------------- cross/buildchroot-stable.conf | 29 ----------------- cross/buildchroot-testing.conf | 29 ----------------- cross/buildchroot.conf | 28 ---------------- cross/crosschroot-stable.conf | 37 --------------------- cross/crosschroot-testing.conf | 37 --------------------- cross/crosschroot.conf | 37 --------------------- cross/mips.conf | 22 ------------- cross/mipsel.conf | 22 ------------- cross/powerpc.conf | 22 ------------- cross/setcrossarch.sh | 59 ---------------------------------- cross/sparc.conf | 22 ------------- cross/test.c | 6 ---- debian/changelog | 1 + debian/control | 7 ---- debian/multistrap.install | 3 -- examples/multiarch.conf | 10 ++---- 17 files changed, 3 insertions(+), 390 deletions(-) delete mode 100644 cross/armel.conf delete mode 100644 cross/buildchroot-stable.conf delete mode 100644 cross/buildchroot-testing.conf delete mode 100644 cross/buildchroot.conf delete mode 100644 cross/crosschroot-stable.conf delete mode 100644 cross/crosschroot-testing.conf delete mode 100644 cross/crosschroot.conf delete mode 100644 cross/mips.conf delete mode 100644 cross/mipsel.conf delete mode 100644 cross/powerpc.conf delete mode 100755 cross/setcrossarch.sh delete mode 100644 cross/sparc.conf delete mode 100644 cross/test.c diff --git a/cross/armel.conf b/cross/armel.conf deleted file mode 100644 index b941b4a..0000000 --- a/cross/armel.conf +++ /dev/null @@ -1,22 +0,0 @@ -[General] -include=/usr/share/multistrap/crosschroot.conf -omitrequired=false -configscript= -setupscript=/usr/share/multistrap/setcrossarch.sh -bootstrap=Debian Base 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 -source=http://www.emdebian.org/debian -keyring=emdebian-archive-keyring -suite=squeeze - -[Foreign] -packages= -source=http://http.debian.net/debian -keyring=debian-archive-keyring -suite=unstable -architecture=armel diff --git a/cross/buildchroot-stable.conf b/cross/buildchroot-stable.conf deleted file mode 100644 index 5cb2e05..0000000 --- a/cross/buildchroot-stable.conf +++ /dev/null @@ -1,29 +0,0 @@ -# Example multistrap configuration file for a build chroot -# Need to use cascading to select the toolchain for a cross arch. - -[General] -arch= -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 bootstrap will -# still be installed. -noauth=false -# whether to add the /suite to be explicit about where apt -# needs to look for packages. Default is false. -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=Base -aptsources=Base - -[Base] -packages=apt build-essential fakeroot -source=http://http.debian.net/debian -keyring=debian-archive-keyring -suite=stable -omitdebsrc=false diff --git a/cross/buildchroot-testing.conf b/cross/buildchroot-testing.conf deleted file mode 100644 index 61af8af..0000000 --- a/cross/buildchroot-testing.conf +++ /dev/null @@ -1,29 +0,0 @@ -# Example multistrap configuration file for a build chroot -# Need to use cascading to select the toolchain for a cross arch. - -[General] -arch= -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 bootstrap will -# still be installed. -noauth=false -# whether to add the /suite to be explicit about where apt -# needs to look for packages. Default is false. -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 -aptsources=Debian - -[Debian] -packages=apt build-essential fakeroot -source=http://http.debian.net/debian -keyring=debian-archive-keyring -suite=testing -omitdebsrc=false diff --git a/cross/buildchroot.conf b/cross/buildchroot.conf deleted file mode 100644 index a956efa..0000000 --- a/cross/buildchroot.conf +++ /dev/null @@ -1,28 +0,0 @@ -# Example multistrap configuration file for a sid build chroot - -[General] -arch= -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 bootstrap will -# still be installed. -noauth=false -# whether to add the /suite to be explicit about where apt -# needs to look for packages. Default is false. -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 -aptsources=Debian - -[Debian] -packages=apt build-essential fakeroot -source=http://http.debian.net/debian -keyring=debian-archive-keyring -suite=unstable -omitdebsrc=false diff --git a/cross/crosschroot-stable.conf b/cross/crosschroot-stable.conf deleted file mode 100644 index bd41836..0000000 --- a/cross/crosschroot-stable.conf +++ /dev/null @@ -1,37 +0,0 @@ -# Example multistrap configuration file for a squeeze build chroot -# Need to use cascading to select the toolchain for the cross arch. - -[General] -arch= -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 bootstrap will -# still be installed. -noauth=false -# whether to add the /suite to be explicit about where apt -# needs to look for packages. Default is false. -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=Base Build -aptsources=Base Build - -# Squeeze toolchains need -base from Squeeze. -[Base] -packages=gcc-4.4-base -source=http://http.debian.net/debian -keyring=debian-archive-keyring -suite=squeeze -omitdebsrc=false - -[Build] -packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude -source=http://http.debian.net/debian -keyring=debian-archive-keyring -suite=squeeze -omitdebsrc=false diff --git a/cross/crosschroot-testing.conf b/cross/crosschroot-testing.conf deleted file mode 100644 index cb34f4a..0000000 --- a/cross/crosschroot-testing.conf +++ /dev/null @@ -1,37 +0,0 @@ -# Example multistrap configuration file for a squeeze build chroot -# Need to use cascading to select the toolchain for a cross arch. - -[General] -arch= -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 bootstrap will -# still be installed. -noauth=false -# whether to add the /suite to be explicit about where apt -# needs to look for packages. Default is false. -explicitsuite=true -# 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://http.debian.net/debian -keyring=debian-archive-keyring -suite=squeeze -omitdebsrc=false - -[Debian] -packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude -source=http://http.debian.net/debian -keyring=debian-archive-keyring -suite=testing -omitdebsrc=false diff --git a/cross/crosschroot.conf b/cross/crosschroot.conf deleted file mode 100644 index 478422e..0000000 --- a/cross/crosschroot.conf +++ /dev/null @@ -1,37 +0,0 @@ -# Example multistrap configuration file for a sid build chroot -# Need to use cascading to select the toolchain for a cross arch. - -[General] -arch= -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 bootstrap will -# still be installed. -noauth=false -# whether to add the /suite to be explicit about where apt -# needs to look for packages. Default is false. -explicitsuite=true -# 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://http.debian.net/debian -keyring=debian-archive-keyring -suite=squeeze -omitdebsrc=false - -[Debian] -packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude -source=http://http.debian.net/debian -keyring=debian-archive-keyring -suite=unstable -omitdebsrc=false diff --git a/cross/mips.conf b/cross/mips.conf deleted file mode 100644 index c5f378b..0000000 --- a/cross/mips.conf +++ /dev/null @@ -1,22 +0,0 @@ -[General] -include=/usr/share/multistrap/crosschroot.conf -omitrequired=false -configscript= -setupscript=/usr/share/multistrap/setcrossarch.sh -bootstrap=Debian Base 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 -source=http://www.emdebian.org/debian -keyring=emdebian-archive-keyring -suite=squeeze - -[Foreign] -packages= -source=http://http.debian.net/debian -keyring=debian-archive-keyring -suite=unstable -architecture=mips diff --git a/cross/mipsel.conf b/cross/mipsel.conf deleted file mode 100644 index 6a70c02..0000000 --- a/cross/mipsel.conf +++ /dev/null @@ -1,22 +0,0 @@ -[General] -include=/usr/share/multistrap/crosschroot.conf -omitrequired=false -configscript= -setupscript=/usr/share/multistrap/setcrossarch.sh -bootstrap=Debian Base 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 -source=http://www.emdebian.org/debian -keyring=emdebian-archive-keyring -suite=squeeze - -[Foreign] -packages= -source=http://http.debian.net/debian -keyring=debian-archive-keyring -suite=unstable -architecture=mipsel diff --git a/cross/powerpc.conf b/cross/powerpc.conf deleted file mode 100644 index e36a586..0000000 --- a/cross/powerpc.conf +++ /dev/null @@ -1,22 +0,0 @@ -[General] -include=/usr/share/multistrap/crosschroot.conf -omitrequired=false -configscript= -setupscript=/usr/share/multistrap/setcrossarch.sh -bootstrap=Debian Base 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 -source=http://www.emdebian.org/debian -keyring=emdebian-archive-keyring -suite=squeeze - -[Foreign] -packages= -source=http://http.debian.net/debian -keyring=debian-archive-keyring -suite=unstable -architecture=powerpc diff --git a/cross/setcrossarch.sh b/cross/setcrossarch.sh deleted file mode 100755 index 756c2e6..0000000 --- a/cross/setcrossarch.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh - -set -e - -# Copyright (C) 2009, 2010 Neil Williams -# -# This package is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# meant to be called from multistrap with directory arch variables. -dir=$1 -hostarch=$2 - -if [ -z "$dir" ]; then - echo "No directory specified." - exit 1 -fi - -#run chroot script to ensure no unwanted system interactions (e.g. startup scripts) -if [ -x /usr/share/multistrap/chroot.sh ]; then - /usr/share/multistrap/chroot.sh $dir $hostarch -fi - -cfg="/etc/pdebuild-cross/pdebuild-cross.rc" -if [ -f $cfg ]; then - . $cfg -fi - -if [ -z "$CROSSARCH" ]; then - # get crossarch from dpkg-cross - check if it is not None - if [ -f /etc/dpkg-cross/cross-compile ]; then - DEFARCH=`grep "^default_arch" /etc/dpkg-cross/cross-compile|sed -e 's/default_arch *= *\(.*\)/\1/'` - if [ -n "$DEFARCH" -a "$DEFARCH" != "None" ]; then - CROSSARCH="$DEFARCH" - fi - else - echo "No CROSSARCH set in '$cfg' and no dpkg-cross default: using armel." - CROSSARCH="armel" - fi -fi - -# set the value inside the chroot -echo "#!/bin/sh" > $dir/tmp/set.sh -echo >> $dir/tmp/set.sh -echo "export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true LC_ALL=C LANGUAGE=C LANG=C" >> $dir/tmp/set.sh -echo "echo debconf dpkg-cross/default-arch select $CROSSARCH|debconf-set-selections" >> $dir/tmp/set.sh -echo "Setting debconf dpkg-cross/default-arch to $CROSSARCH" -sudo chroot $dir sh /tmp/set.sh -sudo rm $dir/tmp/set.sh diff --git a/cross/sparc.conf b/cross/sparc.conf deleted file mode 100644 index eec07f7..0000000 --- a/cross/sparc.conf +++ /dev/null @@ -1,22 +0,0 @@ -[General] -include=/usr/share/multistrap/crosschroot.conf -omitrequired=false -configscript= -setupscript= -bootstrap=Debian Base 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 -source=http://www.emdebian.org/debian -keyring=emdebian-archive-keyring -suite=squeeze - -[Foreign] -packages= -source=http://http.debian.net/debian -keyring=debian-archive-keyring -suite=unstable -architecture=sparc diff --git a/cross/test.c b/cross/test.c deleted file mode 100644 index 3b20cd6..0000000 --- a/cross/test.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main (void) -{ - return 0; -} diff --git a/debian/changelog b/debian/changelog index 87d001e..f1a8fcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ multistrap (2.2.1) UNRELEASED; urgency=medium * Update for Jessie release * [INTL:pt] Updated Portuguese translation of manpage (Closes: #756217) + * Drop old crossbuild support reliant on outdated support. -- Neil Williams Sun, 12 Apr 2015 18:15:30 +0100 diff --git a/debian/control b/debian/control index 9c75668..3cc11a3 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,6 @@ Section: admin Architecture: all Depends: ${perl:Depends}, ${misc:Depends}, apt, libconfig-auto-perl, liblocale-gettext-perl, libparse-debian-packages-perl -Recommends: emdebian-archive-keyring Suggests: fakeroot Description: multiple repository bootstrap based on apt A debootstrap replacement with multiple repository support, @@ -32,9 +31,3 @@ Description: multiple repository bootstrap based on apt dpkg and apt outside the final filesystem. If dpkg supports MultiArch, foreign architecture libraries can be installed, where available. - . - Multistrap supercedes emdebian-rootfs and replaces the previous - support for preparing root filesystems for specific machines and - variants. Multistrap includes the previous emdebian-rootfs support - for customisation of package selection and of files created - within the root filesystem. diff --git a/debian/multistrap.install b/debian/multistrap.install index 2d3ea63..5b034e6 100644 --- a/debian/multistrap.install +++ b/debian/multistrap.install @@ -14,6 +14,3 @@ check-deps.sh ./usr/share/multistrap/ device-table.pl ./usr/share/multistrap/ update-rc.d ./usr/share/multistrap/ bash/multistrap ./etc/bash_completion.d/ -cross/*.conf ./usr/share/multistrap/ -cross/test.c ./usr/share/multistrap/ -cross/setcrossarch.sh ./usr/share/multistrap/ diff --git a/examples/multiarch.conf b/examples/multiarch.conf index 01267a0..5bbc684 100644 --- a/examples/multiarch.conf +++ b/examples/multiarch.conf @@ -19,7 +19,7 @@ multiarch=armel mipsel # 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 Foreign Test +bootstrap=Debian Foreign aptsources=Debian [Debian] @@ -31,13 +31,7 @@ suite=wheezy [Foreign] packages=libgcc1 packages=libc6 -architecture=armel +architecture=armhf source=http://http.debian.net/debian keyring=debian-archive-keyring suite=wheezy - -[Test] -packages= -source=http://ftp.uk.debian.org/emdebian-multiarch/ -keyring= -suite=sid