Skip to content

Commit 566d468

Browse files
MichaIngMichaIng
authored
Release v9.3 (#7016)
2 parents e87e1dd + 9747577 commit 566d468

20 files changed

Lines changed: 339 additions & 273 deletions

File tree

‎.build/images/dietpi-installer‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ setenv rootuuid "true"' /boot/boot.cmd
816816
G_DIETPI-NOTIFY 2 "Setting APT sources.list: $DISTRO_TARGET_NAME $DISTRO_TARGET"
817817

818818
# We need to forward $DISTRO_TARGET* to dietpi-set_software, as well as $G_HW_MODEL + $G_RASPBIAN for Debian vs Raspbian decision.
819-
G_DISTRO=$DISTRO_TARGET G_DISTRO_NAME=$DISTRO_TARGET_NAME G_HW_ARCH=$G_HW_ARCH G_HW_MODEL=$G_HW_MODEL G_RASPBIAN=$G_RASPBIAN G_EXEC /boot/dietpi/func/dietpi-set_software apt-mirror default
819+
G_DISTRO=$DISTRO_TARGET G_DISTRO_NAME=$DISTRO_TARGET_NAME G_HW_ARCH=$G_HW_ARCH G_HW_MODEL=$G_HW_MODEL G_RASPBIAN=$G_RASPBIAN HW_VARIANT=$HW_VARIANT G_EXEC /boot/dietpi/func/dietpi-set_software apt-mirror default
820820

821821
# (Re)create DietPi runtime and logs dir, used by G_AGx
822822
G_EXEC mkdir -p /run/dietpi /var/tmp/dietpi/logs
@@ -964,7 +964,7 @@ setenv rootuuid "true"' /boot/boot.cmd
964964
fi
965965

966966
# Assure that dir for additional sources is present
967-
[[ -d '/etc/apt/sources.list.d' ]] || G_EXEC mkdir /etc/apt/sources.list.d
967+
G_EXEC mkdir -p /etc/apt/sources.list.d
968968

969969
### Kernel/bootloader/initramfs packages: We need to install those directly to allow G_AGA() autoremove possible older packages later: https://github.com/MichaIng/DietPi/issues/1285#issuecomment-354602594
970970

@@ -1037,7 +1037,7 @@ _EOF_
10371037
# Remove obsolete lists
10381038
G_EXEC rm -Rf /etc/apt/sources.list.d/*
10391039
# Add Armbian repository
1040-
G_EXEC eval "echo 'deb https://apt.armbian.com/ $DISTRO_TARGET_NAME main' > /etc/apt/sources.list.d/dietpi-armbian.list"
1040+
G_EXEC eval "echo 'deb https://apt.armbian.com ${DISTRO_TARGET_NAME/bullseye/bookworm} main' > /etc/apt/sources.list.d/dietpi-armbian.list"
10411041
# Update APT lists
10421042
G_AGUP
10431043
# Install kernel, device tree, U-Boot, firmware and initramfs packages
@@ -1151,14 +1151,13 @@ _EOF_
11511151
G_AGI initramfs-tools u-boot-tools armbian-firmware "${zstd[@]}"
11521152
[[ ${zstd[0]} ]] && G_CONFIG_INJECT 'COMPRESS=' 'COMPRESS=zstd' /etc/initramfs-tools/initramfs.conf
11531153
# Download and pre-install kernel hosted on dietpi.com where the Armbian APT repo provides a too old version
1154-
# - NanoPi R4S: Solve Ethernet adapter disappearing on soft reboot: https://github.com/MichaIng/DietPi/issues/6342
1155-
if [[ ( $G_HW_MODEL == 72 && $HW_VARIANT == 2 ) || $G_HW_MODEL =~ ^(47|76|83)$ ]]
1154+
if (( $G_HW_MODEL == 83 ))
11561155
then
11571156
G_EXEC_OUTPUT=1 G_EXEC curl -fo package1.deb "https://dietpi.com/downloads/binaries/linux-image-$branch-$kernel.deb"
11581157
G_EXEC_OUTPUT=1 G_EXEC curl -fo package2.deb "https://dietpi.com/downloads/binaries/linux-dtb-$branch-$kernel.deb"
11591158
G_EXEC_OUTPUT=1 G_EXEC curl -fo package3.deb 'https://dietpi.com/downloads/binaries/armbian-firmware.deb'
11601159
local uboot=()
1161-
[[ $G_HW_MODEL == 76 || ( $G_HW_MODEL == 83 && $HW_VARIANT == 1 ) ]] && { G_EXEC_OUTPUT=1 G_EXEC curl -fo package4.deb "https://dietpi.com/downloads/binaries/linux-u-boot-$model-$branch.deb"; uboot=('package4.deb'); }
1160+
#(( $G_HW_MODEL == 83 )) && (( $HW_VARIANT == 1 )) && { G_EXEC_OUTPUT=1 G_EXEC curl -fo package4.deb "https://dietpi.com/downloads/binaries/linux-u-boot-$model-$branch.deb"; uboot=('package4.deb'); }
11621161
G_EXEC_OUTPUT=1 G_EXEC dpkg -i package1.deb package2.deb package3.deb "${uboot[@]}"
11631162
G_EXEC rm package1.deb package2.deb package3.deb "${uboot[@]}"
11641163
fi
@@ -1195,7 +1194,7 @@ _EOF_
11951194
elif (( $G_HW_MODEL == 74 ))
11961195
then
11971196
G_AGI device-tree-compiler
1198-
[[ -d '/boot/overlay-user' ]] || G_EXEC mkdir /boot/overlay-user
1197+
G_EXEC mkdir -p /boot/overlay-user
11991198
cat << '_EOF_' > /boot/overlay-user/dietpi-usb-otg.dts
12001199
/dts-v1/;
12011200
/plugin/;
@@ -1286,6 +1285,14 @@ _EOF_
12861285
[[ -f '/etc/apt/trusted.gpg' ]] && G_EXEC rm /etc/apt/trusted.gpg
12871286
[[ -f '/etc/apt/trusted.gpg~' ]] && G_EXEC rm '/etc/apt/trusted.gpg~'
12881287

1288+
# Skip creating kernel symlinks and remove existing ones
1289+
if [[ -L '/vmlinuz' ]]
1290+
then
1291+
G_DIETPI-NOTIFY 2 'Preventing obsolete kernel and initramfs symlink generation'
1292+
G_EXEC eval 'echo '\''do_symlinks=0'\'' > /etc/kernel-img.conf'
1293+
G_EXEC rm -f /{initrd.img,vmlinuz}{,.old}
1294+
fi
1295+
12891296
# Quartz64
12901297
elif [[ $G_HW_MODEL == 49 && $(findmnt -Ufnro TARGET -T /boot) == '/' ]]
12911298
then
@@ -1441,7 +1448,7 @@ _EOF_
14411448

14421449
# Remove obsolete components from Armbian list and connect via HTTPS
14431450
G_EXEC rm -Rf /etc/apt/sources.list.d/{,.??,.[^.]}*
1444-
G_EXEC eval "echo 'deb https://apt.armbian.com/ $DISTRO_TARGET_NAME main' > /etc/apt/sources.list.d/dietpi-armbian.list"
1451+
G_EXEC eval "echo 'deb https://apt.armbian.com $DISTRO_TARGET_NAME main' > /etc/apt/sources.list.d/dietpi-armbian.list"
14451452

14461453
# Skip creating kernel symlinks and remove existing ones
14471454
if [[ -L '/vmlinuz' ]]
@@ -1477,10 +1484,6 @@ _EOF_
14771484
if dpkg-query -s 'armbian-firmware' &> /dev/null
14781485
then
14791486
aPACKAGES_REQUIRED_INSTALL+=('armbian-firmware')
1480-
1481-
elif dpkg-query -s 'orangepi-firmware' &> /dev/null
1482-
then
1483-
aPACKAGES_REQUIRED_INSTALL+=('orangepi-firmware')
14841487
else
14851488
aPACKAGES_REQUIRED_INSTALL+=('firmware-linux-free') # Free misc
14861489
aPACKAGES_REQUIRED_INSTALL+=('firmware-misc-nonfree') # Non-free misc incl. Ralink and MediaTek WiFi/BT

‎.build/software/Amiberry/build.bash‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,12 @@ Package: amiberry
207207
Version: $v_ami
208208
Architecture: $(dpkg --print-architecture)
209209
Maintainer: MichaIng <micha@dietpi.com>
210-
Date: $(date -u '+%a, %d %b %Y %T %z')
211-
Standards-Version: 4.6.2.0
210+
Date: $(date -uR)
212211
Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')
213212
Depends:$DEPS_APT_VERSIONED
214213
Section: games
215214
Priority: optional
216215
Homepage: https://amiberry.com/
217-
Vcs-Git: https://github.com/BlitterStudio/amiberry.git
218-
Vcs-Browser: https://github.com/BlitterStudio/amiberry
219216
Description: Optimized Amiga emulator for the Raspberry Pi and other ARM boards
220217
This package ships with optimized libSDL2 and capsimg builds.
221218
_EOF_

‎.build/software/gmediarender/build.bash‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ adeps=('libc6' 'gstreamer1.0-alsa' 'gstreamer1.0-libav' 'gstreamer1.0-plugins-go
99
(( $G_DISTRO > 7 )) && adeps+=('libupnp17') || adeps+=('libupnp13')
1010
for i in "${adeps[@]}"
1111
do
12-
dpkg-query -s "$i" &> /dev/null && continue
12+
# Temporarily allow lib*t64 packages, while the 64-bit time_t transition is ongoing on Sid: https://bugs.debian.org/1065394
13+
dpkg-query -s "$i" &> /dev/null || dpkg-query -s "${i}t64" &> /dev/null && continue
1314
G_DIETPI-NOTIFY 1 "Expected dependency package was not installed: $i"
1415
exit 1
1516
done
@@ -163,6 +164,8 @@ find "$DIR" ! \( -path "$DIR/DEBIAN" -prune \) -type f -exec md5sum {} + | sed "
163164
DEPS_APT_VERSIONED=
164165
for i in "${adeps[@]}"
165166
do
167+
# Temporarily allow lib*t64 packages, while the 64-bit time_t transition is ongoing on Sid: https://bugs.debian.org/1065394
168+
dpkg-query -s "$i" &> /dev/null || i+='t64'
166169
DEPS_APT_VERSIONED+=" $i (>= $(dpkg-query -Wf '${VERSION}' "$i")),"
167170
done
168171
DEPS_APT_VERSIONED=${DEPS_APT_VERSIONED%,}
@@ -182,15 +185,12 @@ Package: $name
182185
Version: $version-$suffix
183186
Architecture: $(dpkg --print-architecture)
184187
Maintainer: MichaIng <micha@dietpi.com>
185-
Date: $(date -u '+%a, %d %b %Y %T %z')
186-
Standards-Version: 4.6.2.0
188+
Date: $(date -uR)
187189
Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')
188190
Depends:$DEPS_APT_VERSIONED
189191
Section: sound
190192
Priority: optional
191193
Homepage: $repo
192-
Vcs-Git: $repo.git
193-
Vcs-Browser: $repo
194194
Description: Minimalist UPNP AV renderer
195195
gmrender-resurrect is a minimalist UPNP AV renderer that can be used to
196196
play music controlled by a UPNP AV control point. This package contains

‎.build/software/raspberrypi-sys-mods/build.bash‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,11 @@ Package: raspberrypi-sys-mods
5454
Version: 2:20230510-dietpi2
5555
Architecture: all
5656
Maintainer: MichaIng <micha@dietpi.com>
57-
Date: $(date -u '+%a, %d %b %Y %T %z')
58-
Standards-Version: 4.6.2.0
57+
Date: $(date -uR)
5958
Installed-Size: $(du -sk raspberrypi-sys-mods | mawk '{print $1}')
6059
Section: admin
6160
Priority: optional
6261
Homepage: https://github.com/RPi-Distro/raspberrypi-sys-mods
63-
Vcs-Git: https://github.com/RPi-Distro/raspberrypi-sys-mods.git
64-
Vcs-Browser: https://github.com/RPi-Distro/raspberrypi-sys-mods
6562
Description: System tweaks for the Raspberry Pi, DietPi edition
6663
_EOF_
6764
G_CONFIG_INJECT 'Installed-Size: ' "Installed-Size: $(du -sk raspberrypi-sys-mods | mawk '{print $1}')" raspberrypi-sys-mods/DEBIAN/control

‎.build/software/shairport-sync/build.bash‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ case $G_DISTRO in
2222
esac
2323
for i in "${adeps[@]}" "${adeps2[@]}"
2424
do
25-
dpkg-query -s "$i" &> /dev/null && continue
25+
# Temporarily allow lib*t64 packages, while the 64-bit time_t transition is ongoing on Sid: https://bugs.debian.org/1065394
26+
dpkg-query -s "$i" &> /dev/null || dpkg-query -s "${i}t64" &> /dev/null && continue
2627
G_DIETPI-NOTIFY 1 "Expected dependency package was not installed: $i"
2728
exit 1
2829
done
@@ -348,6 +349,8 @@ find "$DIR" ! \( -path "$DIR/DEBIAN" -prune \) -type f -exec md5sum {} + | sed "
348349
DEPS_APT_VERSIONED=
349350
for i in "${adeps[@]}"
350351
do
352+
# Temporarily allow lib*t64 packages, while the 64-bit time_t transition is ongoing on Sid: https://bugs.debian.org/1065394
353+
dpkg-query -s "$i" &> /dev/null || i+='t64'
351354
DEPS_APT_VERSIONED+=" $i (>= $(dpkg-query -Wf '${VERSION}' "$i")),"
352355
done
353356
DEPS_APT_VERSIONED=${DEPS_APT_VERSIONED%,}
@@ -528,6 +531,8 @@ find "$DIR" ! \( -path "$DIR/DEBIAN" -prune \) -type f -exec md5sum {} + | sed "
528531
# - Obtain DEB dependency versions
529532
for i in "${adeps2[@]}"
530533
do
534+
# Temporarily allow lib*t64 packages, while the 64-bit time_t transition is ongoing on Sid: https://bugs.debian.org/1065394
535+
dpkg-query -s "$i" &> /dev/null || i+='t64'
531536
DEPS_APT_VERSIONED+=", $i (>= $(dpkg-query -Wf '${VERSION}' "$i"))"
532537
done
533538
# shellcheck disable=SC2001
@@ -539,16 +544,13 @@ Package: $name-airplay2
539544
Version: $version-$suffix
540545
Architecture: $(dpkg --print-architecture)
541546
Maintainer: MichaIng <micha@dietpi.com>
542-
Date: $(date -u '+%a, %d %b %Y %T %z')
543-
Standards-Version: 4.6.2.0
547+
Date: $(date -uR)
544548
Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')
545549
Depends:$DEPS_APT_VERSIONED
546550
Conflicts: $name
547551
Section: sound
548552
Priority: optional
549553
Homepage: $repo
550-
Vcs-Git: $repo.git
551-
Vcs-Browser: $repo
552554
Description: AirPlay audio player
553555
Plays audio streamed from iTunes, iOS devices and third-party AirPlay
554556
sources such as ForkedDaapd and others. Audio played by a Shairport

‎.build/software/squeezelite/build.bash‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,16 +164,13 @@ Package: squeezelite
164164
Version: $version-$suffix
165165
Architecture: $(dpkg --print-architecture)
166166
Maintainer: MichaIng <micha@dietpi.com>
167-
Date: $(date -u '+%a, %d %b %Y %T %z')
168-
Standards-Version: 4.6.2.0
167+
Date: $(date -uR)
169168
Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')
170169
Depends:$DEPS_APT_VERSIONED
171170
Conflicts: squeezelite-pa, squeezelite-pulseaudio
172171
Section: sound
173172
Priority: optional
174173
Homepage: https://github.com/ralph-irving/squeezelite
175-
Vcs-Git: https://github.com/ralph-irving/squeezelite.git
176-
Vcs-Browser: https://github.com/ralph-irving/squeezelite
177174
Description: lightweight headless Squeezebox emulator - ALSA version
178175
Squeezelite is a small headless Squeezebox emulator. It is aimed at
179176
supporting high quality audio including USB DAC based output at multiple

‎.build/software/vaultwarden/build.bash‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,15 +227,12 @@ Package: vaultwarden
227227
Version: $version
228228
Architecture: $(dpkg --print-architecture)
229229
Maintainer: MichaIng <micha@dietpi.com>
230-
Date: $(date -u '+%a, %d %b %Y %T %z')
231-
Standards-Version: 4.6.2.0
230+
Date: $(date -uR)
232231
Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')
233232
Depends:$DEPS_APT_VERSIONED
234233
Section: misc
235234
Priority: optional
236235
Homepage: https://github.com/dani-garcia/vaultwarden
237-
Vcs-Git: https://github.com/dani-garcia/vaultwarden.git
238-
Vcs-Browser: https://github.com/dani-garcia/vaultwarden
239236
Description: Alternative implementation of the Bitwarden server API written in
240237
Rust and compatible with upstream Bitwarden clients, perfect for self-hosted
241238
deployment where running the official resource-heavy service might not be ideal.

‎.build/software/ympd/build.bash‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ case $G_DISTRO in
1515
esac
1616
for i in "${adeps[@]}"
1717
do
18-
dpkg-query -s "$i" &> /dev/null && continue
18+
# Temporarily allow lib*t64 packages, while the 64-bit time_t transition is ongoing on Sid: https://bugs.debian.org/1065394
19+
dpkg-query -s "$i" &> /dev/null || dpkg-query -s "${i}t64" &> /dev/null && continue
1920
G_DIETPI-NOTIFY 1 "Expected dependency package was not installed: $i"
2021
exit 1
2122
done
@@ -137,6 +138,8 @@ find "$DIR" ! \( -path "$DIR/DEBIAN" -prune \) -type f -exec md5sum {} + | sed "
137138
DEPS_APT_VERSIONED=
138139
for i in "${adeps[@]}"
139140
do
141+
# Temporarily allow lib*t64 packages, while the 64-bit time_t transition is ongoing on Sid: https://bugs.debian.org/1065394
142+
dpkg-query -s "$i" &> /dev/null || i+='t64'
140143
DEPS_APT_VERSIONED+=" $i (>= $(dpkg-query -Wf '${VERSION}' "$i")),"
141144
done
142145
DEPS_APT_VERSIONED=${DEPS_APT_VERSIONED%,}
@@ -157,15 +160,12 @@ Package: ympd
157160
Version: $version-$suffix
158161
Architecture: $(dpkg --print-architecture)
159162
Maintainer: MichaIng <micha@dietpi.com>
160-
Date: $(date -u '+%a, %d %b %Y %T %z')
161-
Standards-Version: 4.6.2.0
163+
Date: $(date -uR)
162164
Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')
163165
Depends:$DEPS_APT_VERSIONED
164166
Section: sound
165167
Priority: optional
166168
Homepage: https://github.com/SuperBFG7/ympd
167-
Vcs-Git: https://github.com/SuperBFG7/ympd.git
168-
Vcs-Browser: https://github.com/SuperBFG7/ympd
169169
Description: Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS
170170
_EOF_
171171
G_CONFIG_INJECT 'Installed-Size: ' "Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')" "$DIR/DEBIAN/control"

‎.meta/dietpi-survey_report‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,10 +712,11 @@ shopt -s extglob
712712
aSOFTWARE_NAME9_0[i]=${aSOFTWARE_NAME8_25[i]}
713713
aSOFTWARE_NAME9_1[i]=${aSOFTWARE_NAME9_0[i]}
714714
aSOFTWARE_NAME9_2[i]=${aSOFTWARE_NAME9_1[i]}
715+
aSOFTWARE_NAME9_3[i]=${aSOFTWARE_NAME9_2[i]}
715716
done
716717

717718
# Pre-create software counter array so that we can see also software (available in newest version) with 0 installs
718-
for i in "${aSOFTWARE_NAME9_2[@]}"
719+
for i in "${aSOFTWARE_NAME9_3[@]}"
719720
do
720721
aSOFTWARE[$i]=0
721722
done

0 commit comments

Comments
 (0)