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 the milk-v-mars SUBARCH to milkvmars

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2024-04-23 15:22:36 +01:00
parent f56d59226b
commit a8af6ce59e
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (24.04.68) UNRELEASED; urgency=medium
* Rename the milk-v-mars SUBARCH to milkvmars.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 23 Apr 2024 15:20:56 +0100
livecd-rootfs (24.04.67) noble; urgency=medium
[ Julian Andres Klode ]

4
live-build/auto/config
View File

@ -9,7 +9,7 @@ case $ARCH:$SUBARCH in
i386:|\
ppc64el:|\
riscv64:|riscv64:generic|riscv64:icicle|riscv64:licheerv|\
riscv64:milk-v-mars|riscv64:nezha|riscv64:unmatched|riscv64:visionfive|\
riscv64:milkvmars|riscv64:nezha|riscv64:unmatched|riscv64:visionfive|\
riscv64:visionfive2|\
s390x:|\
*appliance*)
@ -394,7 +394,7 @@ if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then
case $ARCH:$SUBARCH in
riscv64:icicle | \
riscv64:licheerv | \
riscv64:milk-v-mars | \
riscv64:milkvmars | \
riscv64:nezha | \
riscv64:unmatched | \
riscv64:visionfive | \

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

@ -132,7 +132,7 @@ create_partitions() {
--change-name=3:uEnv \
--new=1:: \
--attributes=1:set:2
elif [ "${SUBARCH:-}" = "visionfive2" ] || [ "${SUBARCH:-}" = "milk-v-mars" ]; then
elif [ "${SUBARCH:-}" = "visionfive2" ] || [ "${SUBARCH:-}" = "milkvmars" ]; then
# VisionFive 2, Milk-V Mars
sgdisk "${disk_image}" \
--set-alignment=4096 \
@ -285,7 +285,7 @@ install_grub() {
loader="${loop_device}p13"
dd if=mountpoint/usr/lib/u-boot/microchip_icicle/u-boot.payload of=$loader
;;
"milk-v-mars")
"milkvmars")
cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/
# 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,