Skip to content

Commit 8ad12ac

Browse files
authored
Merge pull request #7549 from MichaIng/dev
dietpi-installer: remove temporary fix
2 parents 47c7204 + 21f6de5 commit 8ad12ac

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

.build/images/dietpi-installer

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -850,13 +850,6 @@ setenv rootuuid "true"' /boot/boot.cmd
850850
G_CONFIG_INJECT "G_LIVE_PATCH_STATUS\[$i\]=" "G_LIVE_PATCH_STATUS[$i]='${G_LIVE_PATCH_STATUS[$i]}'" /boot/dietpi/.version
851851
done
852852

853-
# ToDo: Temporarily fix RPi Trixie builds for master branch images
854-
if (( $G_HW_MODEL < 10 && $DISTRO_TARGET > 7 )) && [[ $G_GITOWNER:$G_GITBRANCH == 'MichaIng:master' ]]
855-
then
856-
G_DIETPI-NOTIFY 2 'Temporarily fix RPi Trixie builds for master branch images'
857-
G_EXEC curl -sSfo /boot/dietpi/func/dietpi-set_software 'https://raw.githubusercontent.com/MichaIng/DietPi/6a9ab2a/dietpi/func/dietpi-set_software'
858-
fi
859-
860853
G_EXEC cp /boot/dietpi/.version /var/lib/dietpi/.dietpi_image_version
861854

862855
G_EXEC systemctl daemon-reload

0 commit comments

Comments
 (0)