Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-06 16:31:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.664.24

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2021-06-29 17:18:49 +00:00
parent 345d6cef79
commit 4ffdb37e31
3 changed files with 14 additions and 3 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.664.24) focal; urgency=medium
* Backport generalising of the riscv64 images from hirsute to support
building separate unmatched and unleashed images in focal (LP: #1932014)
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 15 Jun 2021 13:33:33 +0200
livecd-rootfs (2.664.23) focal; urgency=medium livecd-rootfs (2.664.23) focal; urgency=medium
* Adding dependencies for Active Directory support (LP: #1921374) * Adding dependencies for Active Directory support (LP: #1921374)

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

@ -136,13 +136,17 @@ install_grub() {
chroot mountpoint u-boot-update chroot mountpoint u-boot-update
if [ -n "${SUBARCH:-}" ]; then if [ -n "${SUBARCH:-}" ]; then
u_boot_arch="${SUBARCH}"
if [ "${u_boot_arch}" = "hifive" ]; then
u_boot_arch=sifive_fu540
fi
chroot mountpoint apt-get install -qqy u-boot-sifive chroot mountpoint apt-get install -qqy u-boot-sifive
# FSBL, which gets U-Boot SPL # FSBL, which gets U-Boot SPL
loader1="/dev/mapper${loop_device///dev/}p13" loader1="/dev/mapper${loop_device///dev/}p13"
# The real U-Boot # The real U-Boot
loader2="/dev/mapper${loop_device///dev/}p14" loader2="/dev/mapper${loop_device///dev/}p14"
dd if=mountpoint/usr/lib/u-boot/sifive_fu540/u-boot-spl.bin of=$loader1 dd if=mountpoint/usr/lib/u-boot/${u_boot_arch}/u-boot-spl.bin of=$loader1
dd if=mountpoint/usr/lib/u-boot/sifive_fu540/u-boot.itb of=$loader2 dd if=mountpoint/usr/lib/u-boot/${u_boot_arch}/u-boot.itb of=$loader2
# Provide end-user modifyable CIDATA # Provide end-user modifyable CIDATA
cidata_dev="/dev/mapper${loop_device///dev/}p12" cidata_dev="/dev/mapper${loop_device///dev/}p12"
setup_cidata "${cidata_dev}" setup_cidata "${cidata_dev}"

2
live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary
View File

@ -7,7 +7,7 @@ case $ARCH:$SUBARCH in
xz -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz xz -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz
exit 0 exit 0
;; ;;
riscv64:hifive) riscv64:hifive|riscv64:sifive_*)
xz -T4 -c binary/boot/disk-uefi.ext4 > livecd.ubuntu-cpc.disk1.img.xz xz -T4 -c binary/boot/disk-uefi.ext4 > livecd.ubuntu-cpc.disk1.img.xz
exit 0 exit 0
;; ;;