From a8af6ce59eeae840a13f42990a38a7bf7ded95eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 23 Apr 2024 15:22:36 +0100 Subject: [PATCH 1/5] Rename the milk-v-mars SUBARCH to milkvmars --- debian/changelog | 6 ++++++ live-build/auto/config | 4 ++-- .../hooks.d/base/disk-image-uefi-non-cloud.binary | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 53c19d8e..ad7f3415 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (24.04.68) UNRELEASED; urgency=medium + + * Rename the milk-v-mars SUBARCH to milkvmars. + + -- Łukasz 'sil2100' Zemczak Tue, 23 Apr 2024 15:20:56 +0100 + livecd-rootfs (24.04.67) noble; urgency=medium [ Julian Andres Klode ] diff --git a/live-build/auto/config b/live-build/auto/config index a229f393..e87be6cd 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -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 | \ 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 d86fd830..8ea2128f 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 @@ -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, From 04c1fdc8991a06e5ee01c0243f08b1148ef25182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 23 Apr 2024 15:25:57 +0100 Subject: [PATCH 2/5] releasing package livecd-rootfs version 24.04.68 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ad7f3415..d5a6ca61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (24.04.68) UNRELEASED; urgency=medium +livecd-rootfs (24.04.68) noble; urgency=medium * Rename the milk-v-mars SUBARCH to milkvmars. From 58d01c0d05119856eb2fa459a9fd943b85af8d67 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Tue, 23 Apr 2024 08:09:38 -0600 Subject: [PATCH 3/5] changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index d5a6ca61..f9fddd59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (24.04.69) UNRELEASED; urgency=medium + + * + + -- Dan Bungert Tue, 23 Apr 2024 08:09:29 -0600 + livecd-rootfs (24.04.68) noble; urgency=medium * Rename the milk-v-mars SUBARCH to milkvmars. From 9946962363927983cff38de4df84a228df78d1d8 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Tue, 23 Apr 2024 09:10:08 -0600 Subject: [PATCH 4/5] desktop: move udisks2-inhibit to service (LP: #2063192) --- debian/changelog | 2 +- .../udisks2-inhibit.service | 1 + .../systemd/system/udisks2-inhibit.service | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 120000 live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/graphical.target.wants/udisks2-inhibit.service create mode 100644 live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/udisks2-inhibit.service diff --git a/debian/changelog b/debian/changelog index f9fddd59..4cb4b542 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ livecd-rootfs (24.04.69) UNRELEASED; urgency=medium - * + * desktop: move udisks2-inhibit to service (LP: #2063192) -- Dan Bungert Tue, 23 Apr 2024 08:09:29 -0600 diff --git a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/graphical.target.wants/udisks2-inhibit.service b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/graphical.target.wants/udisks2-inhibit.service new file mode 120000 index 00000000..f449efe1 --- /dev/null +++ b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/graphical.target.wants/udisks2-inhibit.service @@ -0,0 +1 @@ +../udisks2-inhibit.service \ No newline at end of file diff --git a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/udisks2-inhibit.service b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/udisks2-inhibit.service new file mode 100644 index 00000000..6a699487 --- /dev/null +++ b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/udisks2-inhibit.service @@ -0,0 +1,19 @@ +[Unit] +Description=inhibit disk automounting +Before=udisks2.service + +[Service] +Type=oneshot +RemainAfterExit=yes + +ExecStart=mkdir -p /run/udev/rules.d +ExecStart=sh -c "echo 'SUBSYSTEM==\"block\", ENV{UDISKS_IGNORE}=\"1\"' > /run/udev/rules.d/10-udisks-inhibit.rules" +ExecStart=udevadm control --reload +ExecStart=udevadm trigger --subsystem-match=block + +ExecStopPost=rm -f /run/udev/rules.d/10-udisks-inhibit.rules +ExecStopPost=udevadm control --reload +ExecStopPost=udevadm trigger --subsystem-match=block + +[Install] +WantedBy=graphical.target From 2c268fca31f9ba159bed60800b12eb2c2d5bf70a Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Tue, 23 Apr 2024 13:37:07 -0600 Subject: [PATCH 5/5] releasing package livecd-rootfs version 24.04.69 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4cb4b542..0e0ae61b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (24.04.69) UNRELEASED; urgency=medium +livecd-rootfs (24.04.69) noble; urgency=medium * desktop: move udisks2-inhibit to service (LP: #2063192) - -- Dan Bungert Tue, 23 Apr 2024 08:09:29 -0600 + -- Dan Bungert Tue, 23 Apr 2024 13:37:05 -0600 livecd-rootfs (24.04.68) noble; urgency=medium