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

Imported 23.10.44 from mantic-release pocket.

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-09-23 09:51:08 +00:00
parent 007da3a58d
commit 46b1cbade0
4 changed files with 65 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/changelog vendored
View File

@ -1,3 +1,17 @@
livecd-rootfs (23.10.44) mantic; urgency=medium
* Fix the subarch used in the hook to identify images for sifive
unmatched. LP: #2037060.
-- Steve Langasek <steve.langasek@ubuntu.com> Fri, 22 Sep 2023 10:58:57 -0700
livecd-rootfs (23.10.43) mantic; urgency=medium
* The unminimize script should install the lxd snap from the per-release
channel, the same as in the full image. (LP: #2036725)
-- Utkarsh Gupta <utkarsh@ubuntu.com> Fri, 22 Sep 2023 15:01:43 +0530
livecd-rootfs (23.10.42) mantic; urgency=medium livecd-rootfs (23.10.42) mantic; urgency=medium
* fix: Fix the missing `fi` with the recent changes in the * fix: Fix the missing `fi` with the recent changes in the

5
live-build/auto/build
View File

@ -317,8 +317,9 @@ fi
echo "Removing lxd installer package..." echo "Removing lxd installer package..."
apt-get purge -y lxd-installer apt-get purge -y lxd-installer
echo "Installing lxd from snap..." . /etc/os-release
snap install lxd echo "Installing lxd from snap from stable/ubuntu-$VERSION_ID channel"
snap install --channel="stable/ubuntu-$VERSION_ID" lxd
EOF EOF
fi fi
cat >> chroot/usr/local/sbin/unminimize <<'EOF' cat >> chroot/usr/local/sbin/unminimize <<'EOF'

2
live-build/auto/config
View File

@ -352,7 +352,7 @@ if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then
riscv64:icicle | \ riscv64:icicle | \
riscv64:nezha | \ riscv64:nezha | \
riscv64:licheerv | \ riscv64:licheerv | \
riscv64:sifive_* | \ riscv64:unmatched | \
riscv64:visionfive | \ riscv64:visionfive | \
riscv64:visionfive2 | \ riscv64:visionfive2 | \
*:generic) *:generic)

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

@ -355,7 +355,7 @@ EOF
# This explains why we install flash-kernel here. # This explains why we install flash-kernel here.
chroot mountpoint bash -c "echo 'StarFive VisionFive 2 v1.3B' > /etc/flash-kernel/machine" chroot mountpoint bash -c "echo 'StarFive VisionFive 2 v1.3B' > /etc/flash-kernel/machine"
;; ;;
"sifive_unmatched") unmatched)
cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/ cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/
chroot mountpoint bash -c "echo 'SiFive HiFive Unmatched A00' > /etc/flash-kernel/machine" chroot mountpoint bash -c "echo 'SiFive HiFive Unmatched A00' > /etc/flash-kernel/machine"
chroot mountpoint apt-get install -qqy u-boot-sifive chroot mountpoint apt-get install -qqy u-boot-sifive