From 151f73e8b07eae9fd284d49a03117903dd668d77 Mon Sep 17 00:00:00 2001 From: Brian Murray Date: Mon, 17 Oct 2022 13:01:45 -0700 Subject: [PATCH] Finish the rename of FK_FORCE_CONTAINER into FK_FORCE. (LP: #1989194) --- debian/changelog | 6 ++++++ live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e9c2849e..208b6f44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.791) UNRELEASED; urgency=medium + + * Finish the rename of FK_FORCE_CONTAINER into FK_FORCE. (LP: #1989194) + + -- Brian Murray Mon, 17 Oct 2022 13:01:01 -0700 + livecd-rootfs (2.790) kinetic; urgency=medium * riscv: reduce the size of the intird for Nezha and LicheeRV 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 c315693b..141010d4 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 @@ -249,7 +249,7 @@ install_grub() { # This explains why we install flash-kernel here. chroot mountpoint mkdir -p /etc/flash-kernel/ chroot mountpoint bash -c "echo 'Microchip PolarFire-SoC Icicle Kit' > /etc/flash-kernel/machine" - chroot mountpoint bash -c 'FK_FORCE_CONTAINER=yes apt-get install -qqy grub-efi-riscv64 flash-kernel' + chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel' efi_target=riscv64-efi # The real U-Boot chroot mountpoint apt-get install -qqy u-boot-microchip