Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-08-09 15:54:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.706

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2020-12-04 04:09:30 +00:00
parent d6c545c09f
commit 9bb5733a60
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
debian/changelog vendored
View File

@ -1,3 +1,16 @@
livecd-rootfs (2.706) hirsute; urgency=medium
[ Łukasz 'sil2100' Zemczak ]
* As per discussion, we might want to keep the UC20 images a bit bigger than
what's defined via the gadget/rootfs contents, to make sure writable is
comfortably big enough. Use the same hard-coded value as for UC16 and UC18.
(LP: #1905990)
[ Dimitri John Ledkov ]
* riscv64: fixup subarch build, unbound variable
-- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 03 Dec 2020 16:18:21 +0000
livecd-rootfs (2.705) hirsute; urgency=medium livecd-rootfs (2.705) hirsute; urgency=medium
* config: on hirsute build UC22 images * config: on hirsute build UC22 images

5
live-build/auto/config
View File

@ -361,11 +361,8 @@ case $IMAGEFORMAT in
case $MODEL in case $MODEL in
pc-amd64|pc-i386) pc-amd64|pc-i386)
if [ -z "${SUBARCH:-}" ]; then if [ -z "${SUBARCH:-}" ]; then
case $SUITE in # This is to make sure there's enough writable space
xenial|bionic)
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
;;
esac
fi fi
;; ;;
*) ;; *) ;;

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

@ -137,12 +137,12 @@ install_grub() {
if [ -n "${SUBARCH:-}" ]; then if [ -n "${SUBARCH:-}" ]; then
chroot mountpoint apt-get install -qqy u-boot-sifive chroot mountpoint apt-get install -qqy u-boot-sifive
dd if=mountpoint/usr/lib/u-boot/sifive_fu540/u-boot-spl.bin of=$loader1
dd if=mountpoint/usr/lib/u-boot/sifive_fu540/u-boot.itb of=$loader2
# 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/sifive_fu540/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}"