From 5d9290dbfdf99bfef9b12685e88e8ac47b0f6c03 Mon Sep 17 00:00:00 2001 From: MichaIng Date: Wed, 20 Nov 2024 01:28:17 +0100 Subject: [PATCH] v9.9 - DietPi-Installer | Support test kernel isntalls for Quartz64 --- .build/images/dietpi-installer | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.build/images/dietpi-installer b/.build/images/dietpi-installer index 5216874c02..ddc80d4a2d 100755 --- a/.build/images/dietpi-installer +++ b/.build/images/dietpi-installer @@ -1171,7 +1171,7 @@ _EOF_ G_AGI initramfs-tools u-boot-tools armbian-firmware "${zstd[@]}" [[ ${zstd[0]} ]] && G_CONFIG_INJECT 'COMPRESS=' 'COMPRESS=zstd' /etc/initramfs-tools/initramfs.conf - # Download and pre-install kernel hosted on dietpi.com where the Armbian APT repo provides a too old version or is not available + # Install testing kernel build if requested if (( $TEST_KERNEL )) then G_EXEC_OUTPUT=1 G_EXEC curl -fo package1.deb "https://dietpi.com/downloads/binaries/testing/linux-image-$branch-$kernel.deb" @@ -1180,7 +1180,7 @@ _EOF_ G_EXEC rm package[12].deb fi - # Download and pre-install U-Boot hosted on dietpi.com where the Armbian APT repo provides a too old version or is not available + # Install testing U-Boot build if requested if (( $TEST_UBOOT )) then G_EXEC_OUTPUT=1 G_EXEC curl -fo package.deb "https://dietpi.com/downloads/binaries/testing/linux-u-boot-$model-$branch.deb" @@ -1304,7 +1304,15 @@ _EOF_ 3) variant='soquartz';; *) variant='quartz64a';; esac - G_AGI "firmware-$variant" + # Install testing kernel build if requested + if (( $TEST_KERNEL )) + then + G_EXEC_OUTPUT=1 G_EXEC curl -fo package.deb "https://dietpi.com/downloads/binaries/testing/firmware-$variant.deb" + G_EXEC_OUTPUT=1 G_EXEC dpkg -i package.deb + G_EXEC rm package.deb + else + G_AGI "firmware-$variant" + fi # NanoPi M2/T2/Fire2 Linux 4.4: Requires dedicated boot partition, starting at 4 MiB for U-Boot, with ext4 filesystem elif [[ $G_HW_MODEL == 61 && $(findmnt -Ufnro FSTYPE -M /boot) == 'ext4' ]] && (( $(sfdisk -qlo Start "$BOOT_DEVICE" | mawk 'NR==2') >= 8192 ))