Drop old crossbuild support reliant on outdated support.

This commit is contained in:
Neil Williams 2015-05-03 10:16:24 +01:00
parent 08bff7d818
commit 5a265f764a
17 changed files with 3 additions and 390 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,59 +0,0 @@
#!/bin/sh
set -e
# Copyright (C) 2009, 2010 Neil Williams <codehelp@debian.org>
#
# 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 <http://www.gnu.org/licenses/>.
# 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

View file

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

View file

@ -1,6 +0,0 @@
#include <stdio.h>
int main (void)
{
return 0;
}

1
debian/changelog vendored
View file

@ -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 <codehelp@debian.org> Sun, 12 Apr 2015 18:15:30 +0100

7
debian/control vendored
View file

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

View file

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

View file

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