diff options
| author | intrigeri <intrigeri@boum.org> | 2015-07-29 08:57:55 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2015-07-29 08:57:55 +0000 |
| commit | ac29b779c0f1976b33711689c686bb4a923c066f (patch) | |
| tree | 300a5732d52fb528cdf8513de89d9bd09efd3ce3 /config/binary_local-hooks | |
| parent | 887751423192e66fa53902020aeb1f2393ee5510 (diff) | |
Revert inclusion of syslinux:amd64 in the ISO.
It was introduced (#9381) for reasons that ended up being wrong (#9594).
Here, we also remove amd64 APT sources and dpkg's support for amd64 as a foreign
architecture. We'll need them again when we want to ship Linux 4.x, but once
we're there we can perhaps enable amd64 sources only for selected APT
repositories, to avoid re-introducing #9381.
Reverts:
e9d2e345fc931c59e84ab8064306356a32e5f07b
181c6d268d0f43d7ca8869eab295887f2422036b
e1d331aa9a06b4a115f9f2aee713ea6a40d3e3d8
Will-fix: #9748
Diffstat (limited to 'config/binary_local-hooks')
| -rwxr-xr-x | config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem index 4991739..37ec461 100755 --- a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem +++ b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem @@ -21,12 +21,6 @@ Set_defaults # Seems like we'll have work to do Echo_message 'including syslinux in the ISO filesystem' -### Functions - -syslinux_deb_version_in_chroot () { - chroot chroot dpkg-query -W -f='${Version}\n' syslinux -} - ### Variables LINUX_BINARY_UTILS_DIR='binary/utils/linux' WIN32_BINARY_UTILS_DIR='binary/utils/win32' @@ -34,31 +28,16 @@ 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) + +### Functions + +syslinux_deb_version_in_chroot () { + chroot chroot dpkg-query -W -f='${Version}\n' syslinux +} ### Main mkdir -p "$LINUX_BINARY_UTILS_DIR" "$WIN32_BINARY_UTILS_DIR" "$BINARY_MBR_DIR" - -# Copy 32-bit syslinux binary cp "$CHROOT_SYSLINUX_BIN" "$LINUX_BINARY_UTILS_DIR/" - -# Copy 64-bit syslinux binary -( - olddir=$(pwd) - workdir=$(mktemp -d) - cd "$workdir" - chroot="$olddir/chroot" - Chroot "$chroot" \ - apt-get --yes download \ - syslinux:amd64="$SYSLINUX_DEB_VERSION_IN_CHROOT" - dpkg-deb --extract "$chroot"/syslinux_*.deb . - rm "$chroot"/syslinux_*.deb - cp ./usr/bin/syslinux "$olddir/$LINUX_BINARY_UTILS_DIR/syslinux-amd64" - cd "$olddir" - rm -r "$workdir" -) - -# Copy syslinux MBR cp "$CHROOT_SYSLINUX_MBR" "$BINARY_MBR_DIR/mbr.bin" cat chroot/etc/apt/sources.list chroot/etc/apt/sources.list.d/*.list \ @@ -68,7 +47,7 @@ cat chroot/etc/apt/sources.list chroot/etc/apt/sources.list.d/*.list \ > "$CHROOT_TEMP_APT_SOURCES" Chroot chroot apt-get --yes update Chroot chroot apt-get --yes install dpkg-dev -Chroot chroot apt-get source syslinux="$SYSLINUX_DEB_VERSION_IN_CHROOT" +Chroot chroot apt-get source syslinux="$(syslinux_deb_version_in_chroot)" cp chroot/syslinux-*/bios/win32/syslinux.exe "$WIN32_BINARY_UTILS_DIR/" rm -r chroot/syslinux* rm "$CHROOT_TEMP_APT_SOURCES" |