diff --git a/debian/changelog b/debian/changelog index 661fd4ec..64724f11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,10 @@ -livecd-rootfs (24.04.88) noble; urgency=medium +livecd-rootfs (25.04.89) noble; urgency=medium + + * riscv: add SUBARCH 'jh7110'. (LP: #2099993) + + -- Adriano Cordova Tue, 25 Feb 2025 09:47:54 -0300 + +livecd-rootfs (25.04.88) noble; urgency=medium * risc-v: directly copy device trees to /boot/dtb. (LP: #2092205) diff --git a/live-build/auto/config b/live-build/auto/config index 1eee2c1f..73f933ba 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -9,7 +9,7 @@ case $ARCH:$SUBARCH in armhf:|\ i386:|\ ppc64el:|\ - riscv64:|riscv64:generic|riscv64:icicle|riscv64:licheerv|\ + riscv64:|riscv64:generic|riscv64:icicle|riscv64:jh7110|riscv64:licheerv|\ riscv64:milkvmars|riscv64:nezha|riscv64:pic64gx|riscv64:unmatched|\ riscv64:visionfive|riscv64:visionfive2|\ s390x:|\ @@ -394,6 +394,7 @@ fi if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then case $ARCH:$SUBARCH in riscv64:icicle | \ + riscv64:jh7110 | \ riscv64:licheerv | \ riscv64:milkvmars | \ riscv64:nezha | \ diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary index 4bf7010e..196a172b 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary @@ -133,8 +133,8 @@ create_partitions() { --change-name=3:uEnv \ --new=1:: \ --attributes=1:set:2 - elif [ "${SUBARCH:-}" = "visionfive2" ] || [ "${SUBARCH:-}" = "milkvmars" ]; then - # VisionFive 2, Milk-V Mars + elif [ "${SUBARCH:-}" = "visionfive2" ] || [ "${SUBARCH:-}" = "milkvmars" ] || [ "${SUBARCH:-}" = "jh7110" ]; then + # JH7110 chips: VisionFive 2, Milk-V Mars sgdisk "${disk_image}" \ --set-alignment=4096 \ --new=13:4096:8191 \ @@ -337,7 +337,7 @@ EOF umount "${uenv_mnt_dir}" rmdir "${uenv_mnt_dir}" ;; - "visionfive2"|"milkvmars") + "visionfive2"|"milkvmars"|"jh7110") cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/ chroot mountpoint apt-get install -qqy u-boot-starfive # U-Boot SPL