From 00f35ae9bf715cb5d9b7c49ddf29d21891cf0425 Mon Sep 17 00:00:00 2001 From: Alexandre Ghiti Date: Fri, 8 Jul 2022 14:53:13 +0200 Subject: [PATCH 1/2] 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 --- live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 7a3159fc62986e7a4c6d6fde5bae035f6e5b6537 Mon Sep 17 00:00:00 2001 From: Alexandre Ghiti Date: Thu, 7 Jul 2022 11:05:25 +0200 Subject: [PATCH 2/2] d/changelog: Add FK_FORCE_CONTAINER entry Signed-off-by: Alexandre Ghiti --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 92eb8642..7aa49533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ livecd-rootfs (2.769) UNRELEASED; urgency=medium * Add support for the VisionFive and the Nezha boards + * Set FK_FORCE_CONTAINER for RISC-V images build to force flash-kernel + to run in a container. -- Alexandre Ghiti Tue, 05 Jul 2022 10:55:44 +0200