Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 03:11:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename FK_FORCE_CONTAINER to FK_FORCE

Browse Source
This commit is contained in:
William Wilson 2022-10-19 10:03:04 -05:00
parent bb502f1e8f
commit 6939cb42d5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.765.11) jammy; urgency=medium
* Rename FK_FORCE_CONTAINER into FK_FORCE as its role was extended to also
support chroot (LP: #1989194).
-- William 'jawn-smith' Wilson <jawn-smith@ubuntu.com> Fri, 07 Oct 2022 09:49:30 -0500
livecd-rootfs (2.765.10) jammy; urgency=medium
* The ubuntustudio dkms hook is only created when we're building

4
live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
View File

@ -231,7 +231,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 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
chroot mountpoint apt-get install -qqy nezha-boot0
@ -265,7 +265,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 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
# factory u-boot requires a p3 partition with /boot/uEnv.txt file