ci: update for changed device tree names

starfive-tech@1cc2b6a Signed-off-by: MichaIng <[email protected]>
MichaIng · May 11, 2024 · 37ab140 · 37ab140
1 parent 0f707ac
commit 37ab140
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
         make -j$(nproc)
         make install INSTALL_PATH='linux-image-visionfive2/boot'
         make dtbs_install INSTALL_DTBS_PATH='linux-image-visionfive2/usr/lib/linux-image-visionfive2'
-        find linux-image-visionfive2/usr/lib/linux-image-visionfive2 -mindepth 1 -regextype egrep \( ! -regex '.*/(starfive|vf2-overlay.*|jh7110-visionfive-v2.*\.dtb)' -o -regex '.*/jh7110-visionfive-v2-A1[01].dtb' \) -exec rm -Rf {} +
+        find linux-image-visionfive2/usr/lib/linux-image-visionfive2 -mindepth 1 -regextype egrep \( ! -regex '.*/(starfive|vf2-overlay.*|jh7110-starfive-visionfive-2-.*\.dtb)' -o -regex '.*/jh7110-starfive-visionfive-2-A1[01].dtb' \) -exec rm -Rf {} +
         make modules_install INSTALL_MOD_PATH='linux-image-visionfive2'
         rm linux-image-visionfive2/lib/modules/*/build linux-image-visionfive2/lib/modules/*/source
         # WiFi/BT firmware: https://github.com/starfive-tech/buildroot/blob/JH7110_VisionFive2_devel/package/starfive/starfive-firmware/starfive-firmware.mk

diff --git a/linux-image-visionfive2/DEBIAN/postinst b/linux-image-visionfive2/DEBIAN/postinst
@@ -3,4 +3,6 @@ set -e
 export DEB_MAINT_PARAMS=$* INITRD=Yes
 [ -d '/etc/kernel/postinst.d' ] && run-parts --arg='VERSION' --arg='VERSION' /etc/kernel/postinst.d
 sed -Ei '/^[[:blank:]]*(linux|kernel)/c\linux /boot/vmlinuz-VERSION' /boot/extlinux/extlinux.conf
+# Post-6.1.86-dietpi1 extlinux.conf migration, due to changed device tree names: https://github.com/starfive-tech/linux/commit/1cc2b6a
+dpkg --compare-versions "$1" gt '6.1.86-dietpi1' || sed -i -e 's/jh7110-visionfive-v2/jh7110-starfive-visionfive-2/g' -e 's/jh7110-starfive-visionfive-2\.dtb/jh7110-starfive-visionfive-2-v1.3b\.dtb/g' /boot/extlinux/extlinux.conf
 exit 0
diff --git a/linux-image-visionfive2/boot/extlinux/extlinux.conf b/linux-image-visionfive2/boot/extlinux/extlinux.conf
@@ -1,4 +1,4 @@
 label DietPi
 linux /boot/vmlinuz-VERSION
-fdt /usr/lib/linux-image-visionfive2/starfive/jh7110-visionfive-v2.dtb
+fdt /usr/lib/linux-image-visionfive2/starfive/jh7110-starfive-visionfive-2-v1.3.dtb
 append root=/dev/mmcblk1p1 rootfstype=ext4 rootwait earlycon=sbi console=ttyS0,115200 console=tty1 consoleblank=0 net.ifnames=0