[neon/neon/livecd-rootfs/Neon/release] live-build/ubuntu-cpc/hooks.d/base: riscv: Use FK_FORCE_CONTAINER to force flash-kernel to run in a container

[Alexandre Ghiti]

Git commit bbcf3c571429f4f1c7f72191f10646b24a672aa6 by Alexandre Ghiti.
Committed on 13/07/2022 at 14:04.
Pushed by jriddell into branch 'Neon/release'.

riscv: Use FK_FORCE_CONTAINER to force flash-kernel to run in a container

As explained in LP: #1980929, we need this in order to build RISC-V
images.

Signed-off-by: Alexandre Ghiti <alexandre.ghiti at canonical.com>

M  +2    -2    live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary

https://invent.kde.org/neon/neon/livecd-rootfs/commit/bbcf3c571429f4f1c7f72191f10646b24a672aa6

diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
index 6ca00d7a..f34d827d 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
@@ -230,7 +230,7 @@ install_grub() {
                         # This explains why we install flash-kernel here.
                         chroot mountpoint mkdir -p /etc/flash-kernel/
                         chroot mountpoint bash -c "echo 'Allwinner D1 Nezha' > /etc/flash-kernel/machine"
-                        chroot mountpoint apt-get install -qqy grub-efi-riscv64 flash-kernel
+                        chroot mountpoint bash -c 'FK_FORCE_CONTAINER=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
                         efi_target=riscv64-efi
 
                         chroot mountpoint apt-get install -qqy nezha-boot0
@@ -264,7 +264,7 @@ install_grub() {
                         # This explains why we install flash-kernel here.
                         chroot mountpoint mkdir -p /etc/flash-kernel/
                         chroot mountpoint bash -c "echo 'StarFive VisionFive V1' > /etc/flash-kernel/machine"
-                        chroot mountpoint apt-get install -qqy grub-efi-riscv64 flash-kernel
+                        chroot mountpoint bash -c 'FK_FORCE_CONTAINER=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
                         efi_target=riscv64-efi
 
                         # factory u-boot requires a p3 partition with /boot/uEnv.txt file