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

Merge branch 'allwinner-initrd' of git+ssh://git.launchpad.net/~xypron/livecd-rootfs into ubuntu/master

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2022-10-14 10:39:32 +02:00
commit a2a341a8b2
3 changed files with 21 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.790) UNRELEASED; urgency=medium
* riscv: reduce the size of the intird for Nezha and LicheeRV
* fix invalid redirects
-- Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Thu, 13 Oct 2022 15:38:01 +0200
livecd-rootfs (2.789) kinetic; urgency=medium livecd-rootfs (2.789) kinetic; urgency=medium
* re-enable snap preseed (LP: #1991011) * re-enable snap preseed (LP: #1991011)

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

@ -242,7 +242,7 @@ install_grub() {
# Per-device images # Per-device images
case "${SUBARCH}" in case "${SUBARCH}" in
"icicle") "icicle")
echo "Installing GRUB for ${SUBARCH} board" &1>2 echo "Installing GRUB for ${SUBARCH} board"
# flash-kernel is needed to install the dtb for update-grub: it uses the # flash-kernel is needed to install the dtb for update-grub: it uses the
# /proc/device-tree/model value to pick the correct dtb and as we are in a chroot, # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
# the model value is wrong and we need to use /etc/flash-kernel/machine instead. # the model value is wrong and we need to use /etc/flash-kernel/machine instead.
@ -271,7 +271,12 @@ install_grub() {
chroot mountpoint rm -f /boot/boot.scr chroot mountpoint rm -f /boot/boot.scr
;; ;;
"nezha"|"licheerv") "nezha"|"licheerv")
echo "Installing U-Boot for ${SUBARCH} board" &1>2 local my_d=$(dirname $(readlink -f ${0}))
echo "Reducing initramfs size for ${SUBARCH} board"
mkdir -p mountpoint/etc/initramfs-tools/conf.d/
cp ${my_d}/initramfs-tools/modules_list.conf mountpoint/etc/initramfs-tools/conf.d/
chroot mountpoint update-initramfs -c -v -k all
echo "Installing U-Boot for ${SUBARCH} board"
# flash-kernel is needed to install the dtb for update-grub: it uses the # flash-kernel is needed to install the dtb for update-grub: it uses the
# /proc/device-tree/model value to pick the correct dtb and as we are in a chroot, # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
# the model value is wrong and we need to use /etc/flash-kernel/machine instead. # the model value is wrong and we need to use /etc/flash-kernel/machine instead.
@ -316,7 +321,7 @@ install_grub() {
chroot mountpoint rm -f /boot/boot.scr chroot mountpoint rm -f /boot/boot.scr
;; ;;
"visionfive") "visionfive")
echo "Installing GRUB for VisionFive board" &1>2 echo "Installing GRUB for VisionFive board"
# flash-kernel is needed to install the dtb for update-grub: it uses the # flash-kernel is needed to install the dtb for update-grub: it uses the
# /proc/device-tree/model value to pick the correct dtb and as we are in a chroot, # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
# the model value is wrong and we need to use /etc/flash-kernel/machine instead. # the model value is wrong and we need to use /etc/flash-kernel/machine instead.

6
live-build/ubuntu-cpc/hooks.d/base/initramfs-tools/modules_list.conf Normal file
View File

@ -0,0 +1,6 @@
# The Nezha and the LicheeRV boards do not have enough memory for an initrd with
# most modules. Therefore the number of included modules has to be reduced.
#
# If further modules are needed, add them to /etc/initramfs-tools/modules.
MODULES=list