v9.7

- CI | Satisfy shellcheck
- DietPi-Patches | Migrate to vendor kernel with RK3588 in case of automated first run setup

.build/images/dietpi-build

@@ -613,6 +613,7 @@ _EOF_
  G_CONFIG_INJECT 'AUTO_SETUP_AUTOSTART_TARGET_INDEX=' 'AUTO_SETUP_AUTOSTART_TARGET_INDEX=0' rootfs/boot/dietpi.txt
 
  # Force ARMv6 arch on Raspbian
+ # shellcheck disable=SC2015
  (( $HW_ARCH > 1 )) || echo -e '#/bin/dash\n[ "$*" = -m ] && echo armv6l || /usr/bin/uname "$@"' > rootfs/usr/local/bin/uname && G_EXEC chmod +x rootfs/usr/local/bin/uname || Error_Exit 'Failed to generate /usr/local/bin/uname for ARMv6'
 
  # Skip filesystem expansion

.build/software/Amiberry/container_build.bash

@@ -114,6 +114,7 @@ G_EXEC mkdir rootfs
 G_EXEC mount "${FP_LOOP}p1" rootfs
 
 # Enforce ARMv6 arch on Raspbian
+# shellcheck disable=SC2015
 (( $arch > 1 )) || echo -e '#/bin/dash\n[ "$*" = -m ] && echo armv6l || /usr/bin/uname "$@"' > rootfs/usr/local/bin/uname && G_EXEC chmod +x rootfs/usr/local/bin/uname || Error_Exit 'Failed to generate /usr/local/bin/uname for ARMv6'
 
 # Enable automated setup

.build/software/dietpi-software-build.bash

@@ -118,6 +118,7 @@ G_EXEC mkdir rootfs
 G_EXEC mount "${FP_LOOP}p1" rootfs
 
 # Enforce ARMv6 arch on Raspbian
+# shellcheck disable=SC2015
 (( $arch > 1 )) || echo -e '#/bin/dash\n[ "$*" = -m ] && echo armv6l || /usr/bin/uname "$@"' > rootfs/usr/local/bin/uname && G_EXEC chmod +x rootfs/usr/local/bin/uname || Error_Exit 'Failed to generate /usr/local/bin/uname for ARMv6'
 
 # Enable automated setup

.github/workflows/dietpi-software.bash

@@ -319,6 +319,7 @@ G_EXEC mkdir rootfs
 G_EXEC mount "${FP_LOOP}p1" rootfs
 
 # Force ARMv6 arch on Raspbian
+# shellcheck disable=SC2015
 (( $arch > 1 )) || echo -e '#/bin/dash\n[ "$*" = -m ] && echo armv6l || /usr/bin/uname "$@"' > rootfs/usr/local/bin/uname && G_EXEC chmod +x rootfs/usr/local/bin/uname || Error_Exit 'Failed to generate /usr/local/bin/uname for ARMv6'
 
 # Force RPi on ARM systems if requested

.update/patches

@@ -1690,7 +1690,7 @@ Patch_9_6()
  then
  HW_VARIANT=2 /boot/dietpi/func/dietpi-set_software apt-mirror dietpi
  G_AGUP
- G_AGI linux-u-boot-nanopi-r6c-legacy
+ G_AGI linux-u-boot-nanopi-r6c-vendor
 
  # Odroid XU4/Meson: Install zstd for better compressed initramfs images
  elif dpkg-query -s 'linux-image-current-odroidxu4' &> /dev/null || dpkg-query -s 'linux-image-edge-odroidxu4' &> /dev/null || dpkg-query -s 'linux-image-current-meson' &> /dev/null || dpkg-query -s 'linux-image-edge-meson' &> /dev/null
@@ -1744,7 +1744,7 @@ Patch_9_7()
  # RK3588 migration to vendor kernel
  if (( $G_HW_CPUID == 11 )) && dpkg-query -s 'linux-image-legacy-rk35xx' &> /dev/null && ! dpkg-query -s 'linux-image-vendor-rk35xx' &> /dev/null
  then
- if G_WHIP_YESNO '[ INFO ] Major kernel upgrade to Linux 6.1 available
+ if G_WHIP_DEFAULT_ITEM='yes' G_WHIP_YESNO '[ INFO ] Major kernel upgrade to Linux 6.1 available
 \nFor RK3588 SoC SBCs, we offer a major kernel upgrade to Linux 6.1, base on a new Rockchip kernel source which should provide not only new kernel features, but higher quality as well, compared to the old Rockchip Linux 5.10 legacy kernel.
 \nHowever, while we are not aware of any left issues, it is still good to have a backup in place, and we do not enforce the upgrade. You can do it any time later.
 \nDo you want to migrate to the new Linux 6.1 kernel now?'