diff --git a/debian/changelog b/debian/changelog index 654bc17b..556e0103 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.614) UNRELEASED; urgency=medium + + * 002-add-foreign-kernel.chroot_early: enable amd64 as a foreign arch on + i386 image builds, since this is where the kernel comes from henceforth. + + -- Steve Langasek Wed, 02 Oct 2019 15:58:42 -0700 + livecd-rootfs (2.613) eoan; urgency=medium * 999-ubuntu-image-customization.chroot: use IMAGEFORMAT=none for the checks diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/002-add-foreign-kernel.chroot_early b/live-build/ubuntu-cpc/hooks.d/chroot/002-add-foreign-kernel.chroot_early new file mode 100755 index 00000000..cd60718f --- /dev/null +++ b/live-build/ubuntu-cpc/hooks.d/chroot/002-add-foreign-kernel.chroot_early @@ -0,0 +1,12 @@ +#!/bin/sh + +set -ex + +echo "I: Checking if we are i386 and amd64 architecture should be enabled" + +if [ "$(dpkg --print-architecture)" = "i386" ]; then + echo "I: Enabling amd64 multiarch support on i386" + dpkg --add-architecture amd64 + + apt-get -y update +fi