Commit 2cd9f293 authored by anonym's avatar anonym
Browse files

Merge remote-tracking branch 'origin/feature/13513-64-bit-syslinux' into devel

Fix-committed: #13513
parents 75f091eb 30d6d842
......@@ -31,37 +31,13 @@ syslinux_deb_version_in_chroot () {
LINUX_BINARY_UTILS_DIR='binary/utils/linux'
WIN32_BINARY_UTILS_DIR='binary/utils/win32'
BINARY_MBR_DIR='binary/utils/mbr'
CHROOT_SYSLINUX_BIN='chroot/usr/bin/syslinux'
CHROOT_SYSLINUX_MBR='chroot/usr/lib/SYSLINUX/gptmbr.bin'
CHROOT_TEMP_APT_SOURCES='chroot/etc/apt/sources.list.d/tmp-deb-src.list'
SYSLINUX_DEB_VERSION_IN_CHROOT=$(syslinux_deb_version_in_chroot)
### Main
mkdir -p "$LINUX_BINARY_UTILS_DIR" "$WIN32_BINARY_UTILS_DIR" "$BINARY_MBR_DIR"
# We need the 32-bit binary until most of the users have upgraded to 64-bit.
# Copy 32-bit syslinux binary
(
olddir=$(pwd)
workdir=$(mktemp -d)
cd "$workdir"
chroot="$olddir/chroot"
echo "Configuring APT architectures for the installation of syslinux"
Chroot "$chroot" \
echo 'APT::Architectures {"i386"; "amd64";};' \
> /etc/apt/apt.conf.d/13architectures
Chroot "$chroot" dpkg --add-architecture i386
Chroot "$chroot" apt-get update
echo "Downloading syslinux:i386 version ${SYSLINUX_DEB_VERSION_IN_CHROOT}"
Chroot "$chroot" \
apt-get --yes download \
syslinux:i386="${SYSLINUX_DEB_VERSION_IN_CHROOT}"
echo "Extracting syslinux:i386"
dpkg-deb --extract "$chroot"/syslinux_*.deb .
rm "$chroot"/syslinux_*.deb
cp ./usr/bin/syslinux "$olddir/$LINUX_BINARY_UTILS_DIR/"
cd "$olddir"
rm -r "$workdir"
)
# Copy syslinux MBR
cp "$CHROOT_SYSLINUX_BIN" "$LINUX_BINARY_UTILS_DIR/"
cp "$CHROOT_SYSLINUX_MBR" "$BINARY_MBR_DIR/mbr.bin"
cat chroot/etc/apt/sources.list chroot/etc/apt/sources.list.d/*.list \
......
......@@ -52,8 +52,6 @@ bc
nodejs
# Needed by SSH's ProxyCommand
netcat-openbsd
# Needed by Tails Installer when running on Tails
libc6-i386
### Software
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment