Skip to content

Commit 7fbf072

Browse files
MichaIngMichaIng
authored
Merge pull request #7954 from MichaIng/beta
Release v10.1
2 parents 41de708 + 6a0cb6e commit 7fbf072

34 files changed

+969
-689
lines changed

‎.build/images/Quartz64/quartz64_defconfig‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ CONFIG_ACPI_CPPC_CPUFREQ=m
88
CONFIG_AHCI_CEVA=y
99
CONFIG_AHCI_QORIQ=y
1010
CONFIG_AMBA_PL08X=y
11-
CONFIG_ANDROID=y
12-
CONFIG_ANDROID_BINDERFS=y
13-
CONFIG_ANDROID_BINDER_IPC=y
1411
CONFIG_AQUANTIA_PHY=y
1512
CONFIG_ARCH_ROCKCHIP=y
1613
CONFIG_ARM_MHU=y
@@ -148,7 +145,6 @@ CONFIG_CUSE=m
148145
CONFIG_DEBUG_FS=y
149146
CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
150147
CONFIG_DEBUG_INFO_REDUCED=y
151-
CONFIG_DEBUG_KERNEL=y
152148
CONFIG_DEFAULT_HOSTNAME="DietPi"
153149
CONFIG_DEVFREQ_GOV_PASSIVE=m
154150
CONFIG_DEVFREQ_GOV_PERFORMANCE=m
@@ -163,8 +159,6 @@ CONFIG_DM_CRYPT=m
163159
CONFIG_DM_MIRROR=m
164160
CONFIG_DM_ZERO=m
165161
CONFIG_DRM=y
166-
CONFIG_DRM_ACCEL=y
167-
CONFIG_DRM_ACCEL_ROCKET=m
168162
CONFIG_DRM_DISPLAY_CONNECTOR=m
169163
CONFIG_DRM_DW_HDMI_CEC=y
170164
CONFIG_DRM_I2C_ADV7511=m
@@ -223,7 +217,6 @@ CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
223217
CONFIG_FB=y
224218
CONFIG_FB_SIMPLE=y
225219
CONFIG_FM10K=y
226-
CONFIG_FUNCTION_PROFILER=y
227220
CONFIG_FUNCTION_TRACER=y
228221
CONFIG_FUSE_FS=y
229222
CONFIG_FW_LOADER_USER_HELPER=y
@@ -422,7 +415,6 @@ CONFIG_MMC=y
422415
CONFIG_MMC_ARMMMCI=y
423416
CONFIG_MMC_BLOCK_MINORS=32
424417
CONFIG_MMC_CQHCI=y
425-
CONFIG_MMC_DEBUG=y
426418
CONFIG_MMC_DW=y
427419
CONFIG_MMC_DW_ROCKCHIP=y
428420
CONFIG_MMC_HSQ=y
@@ -688,7 +680,6 @@ CONFIG_PCI=y
688680
CONFIG_PCIEPORTBUS=y
689681
CONFIG_PCIE_DW_PLAT_HOST=y
690682
CONFIG_PCIE_ROCKCHIP_DW_HOST=y
691-
CONFIG_PCI_DEBUG=y
692683
CONFIG_PCI_ENDPOINT=y
693684
CONFIG_PCI_ENDPOINT_CONFIGFS=y
694685
CONFIG_PCI_ENDPOINT_TEST=m
@@ -732,7 +723,6 @@ CONFIG_RC_CORE=m
732723
CONFIG_RC_DECODERS=y
733724
CONFIG_RC_DEVICES=y
734725
CONFIG_REGULATOR=y
735-
CONFIG_REGULATOR_DEBUG=y
736726
CONFIG_REGULATOR_FAN53555=y
737727
CONFIG_REGULATOR_FIXED_VOLTAGE=y
738728
CONFIG_REGULATOR_GPIO=y
@@ -782,8 +772,6 @@ CONFIG_RTW88_8723DE=y
782772
CONFIG_RTW88_8821CE=y
783773
CONFIG_RTW88_8822BE=y
784774
CONFIG_RTW88_8822CE=y
785-
CONFIG_RTW88_DEBUG=y
786-
CONFIG_RTW88_DEBUGFS=y
787775
CONFIG_SATA_AHCI=y
788776
CONFIG_SATA_AHCI_PLATFORM=y
789777
CONFIG_SATA_MV=y

‎.build/images/dietpi-build‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ case $HW_MODEL in
120120
'49.1') iname='Quartz64A' HW_ARCH=3 partition_start=16 root_size=1000;;
121121
'49.2') iname='Quartz64B' HW_ARCH=3 partition_start=16 root_size=1000;;
122122
'49.3') iname='SOQuartz' HW_ARCH=3 partition_start=16 root_size=1000;;
123-
52) iname='ASUSTB' HW_ARCH=2 partition_start=4 root_size=764;;
123+
52) iname='ASUSTB' HW_ARCH=2 partition_start=4 root_size=800;;
124124
54) iname='NanoPiK2' HW_ARCH=3 partition_start=4 root_size=1148;;
125125
55) iname='NanoPiR2S' HW_ARCH=3 partition_start=16 root_size=1200;;
126126
56) iname='NanoPiNEO3' HW_ARCH=3 partition_start=16 root_size=1200;;
@@ -146,34 +146,35 @@ case $HW_MODEL in
146146
'76.1') iname='NanoPiR5S' HW_ARCH=3 partition_start=16 root_size=1200;;
147147
'76.2') iname='NanoPiR5C' HW_ARCH=3 partition_start=16 root_size=1200;;
148148
77) iname='ROCK3A' HW_ARCH=3 partition_start=16 root_size=1200;;
149-
78) iname='ROCK5B' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
150-
'79.1') iname='NanoPiR6S' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
151-
'79.2') iname='NanoPiR6C' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
152-
'79.3') iname='NanoPCT6' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
153-
80) iname='OrangePi5' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
149+
78) iname='ROCK5B' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
150+
'79.1') iname='NanoPiR6S' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
151+
'79.2') iname='NanoPiR6C' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
152+
'79.3') iname='NanoPCT6' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
153+
80) iname='OrangePi5' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
154154
81) iname='VisionFive2' HW_ARCH=11 root_size=800;;
155-
82) iname='OrangePi5Plus' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
155+
82) iname='OrangePi5Plus' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
156156
83) iname='OrangePiZero3' HW_ARCH=3 partition_start=4 root_size=1148;;
157157
84) iname='Star64' HW_ARCH=11 root_size=800;;
158-
85) iname='ROCK5A' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
158+
85) iname='ROCK5A' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
159159
86) iname='ASUSTB2' HW_ARCH=3 partition_start=16 root_size=1200;;
160160
87) iname='OrangePi3B' HW_ARCH=3 partition_start=16 root_size=1200;;
161161
88) iname='OrangePiZero2W' HW_ARCH=3 partition_start=4 root_size=1148;;
162162
89) iname='OrangePi3LTS' HW_ARCH=3 partition_start=4 root_size=1000;;
163163
90) iname='RadxaZERO3' HW_ARCH=3 partition_start=16 root_size=1200;;
164-
91) iname='OrangePi5Max' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
165-
92) iname='NanoPiM6' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
166-
93) iname='OrangePi5Pro' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
167-
94) iname='OrangePi5Ultra' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
168-
95) iname='OrangePiCM5' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
164+
91) iname='OrangePi5Max' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
165+
92) iname='NanoPiM6' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
166+
93) iname='OrangePi5Pro' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
167+
94) iname='OrangePi5Ultra' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
168+
95) iname='OrangePiCM5' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
169169
96) iname='OrangePi4A' HW_ARCH=3 partition_start=4 root_size=1000;;
170170
97) iname='OrangePiRV' HW_ARCH=11 partition_start=4 root_size=1000;;
171171
98) iname='OrangePiRV2' HW_ARCH=11 partition_start=4 root_size=1000;;
172172
99) iname='OrangePi3' HW_ARCH=3 partition_start=4 root_size=1000;;
173173
100) iname='NanoPiR3S' HW_ARCH=3 partition_start=16 root_size=1200;;
174174
101) iname='NanoPiR3SLTS' HW_ARCH=3 partition_start=16 root_size=1200;;
175-
102) iname='NanoPiR76S' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
176-
103) iname='NanoPiM5' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
175+
102) iname='NanoPiR76S' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
176+
103) iname='NanoPiM5' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
177+
104) iname='NanoPiZero2' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1300;;
177178
*) Error_Exit "Invalid hardware model \"$HW_MODEL\" passed";;
178179
esac
179180

@@ -409,8 +410,10 @@ _EOF_
409410
# login is not "essential" anymore since Trixie, hence "mmdebstrap --variant apt" (essential + apt) does not install it. It is still "required", hence cannot be commonly removed, but we need to install it actively once.
410411
packages='apt,bash-completion,ca-certificates,cron,curl,fdisk,gpg,htop,iputils-ping,locales,login,mawk,nano,parted,procps,psmisc,sudo,systemd-sysv,tzdata,udev,wget,whiptail,'
411412
IFS=, packages+=${afspackages[*]}; unset -v IFS
412-
[[ $HW_MODEL == 75 ]] && packages+=',iproute2' || packages+=',console-setup,dropbear,ethtool,fake-hwclock,ifupdown,isc-dhcp-client,kmod,rfkill,systemd-timesyncd,usbutils'
413-
[[ $HW_MODEL =~ ^(20|75)$ ]] || packages+=',iw,wireless-tools,wpasupplicant,wireless-regdb'
413+
[[ $HW_MODEL == 75 ]] && packages+=',iproute2' || packages+=',console-setup,dropbear,ethtool,fake-hwclock,ifupdown,kmod,rfkill,systemd-timesyncd,usbutils'
414+
# DHCP client: isc-dhcp-client has been removed from Forky, and we move to BusyBox's udhcpc.
415+
(( $DISTRO < 9 )) && packages+=',isc-dhcp-client' || packages+=',udhcpc'
416+
[[ $HW_MODEL =~ ^(20|75)$ ]] || packages+=',iw,wpasupplicant,wireless-regdb'
414417
# Add temporary tmpfs mounts to prevent certain files created by debootstrap being written to disk
415418
# - tmpfs mounts have 1777 mode by default.
416419
G_EXEC mount -m -t tmpfs tmpfs rootfs/dev
@@ -568,7 +571,7 @@ then
568571
# Enable Amiberry fast boot autostart option
569572
G_CONFIG_INJECT 'AUTO_SETUP_AUTOSTART_TARGET_INDEX=' 'AUTO_SETUP_AUTOSTART_TARGET_INDEX=6' rootfs/boot/dietpi.txt
570573
# RPi: Enable onboard audio so that it can be detected and configured on first boot
571-
[[ -f 'rootfs/boot/config.txt' ]] && G_CONFIG_INJECT 'dtparam=audio=' 'dtparam=audio=on' rootfs/boot/config.txt
574+
[[ -f 'rootfs/boot/firmware/config.txt' ]] && G_CONFIG_INJECT 'dtparam=audio=' 'dtparam=audio=on' rootfs/boot/firmware/config.txt
572575

573576
G_EXEC umount -R rootfs
574577
G_EXEC rmdir rootfs
@@ -670,8 +673,8 @@ then
670673
/boot/dietpi/func/dietpi-set_hardware serialconsole 0 ttyS0
671674
systemctl mask serial-getty@ttyS0
672675
/boot/dietpi/func/dietpi-set_hardware serialconsole 1 serial0
673-
G_CONFIG_INJECT 'temp_limit=' 'temp_limit=75' /boot/config.txt # since most RPis are now RPi 4 and Allo ships the CM3 with USBridge Sig and Allo GUI image
674-
G_EXEC sed --follow-symlinks -Ei 's/^(arm_freq|over_voltage)=/#\1=/' /boot/config.txt
676+
G_CONFIG_INJECT 'temp_limit=' 'temp_limit=75' /boot/firmware/config.txt # since most RPis are now RPi 4 and Allo ships the CM3 with USBridge Sig and Allo GUI image
677+
G_EXEC sed --follow-symlinks -Ei 's/^(arm_freq|over_voltage)=/#\1=/' /boot/firmware/config.txt
675678
fi
676679
677680
# FirstBoot

‎.build/images/dietpi-installer‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@ _EOF_
396396
'65.2' ': NanoPi NEO2 Black'
397397
'56' ': NanoPi NEO3'
398398
'57' ': NanoPi NEO Plus2'
399+
'104' ': NanoPi Zero2'
399400
'68.1' ': NanoPi M4'
400401
'68.2' ': NanoPC T4'
401402
'68.3' ': NanoPi NEO4'
@@ -629,12 +630,10 @@ _EOF_
629630
local armbian_packages=0
630631
if (( $G_HW_MODEL < 10 ))
631632
then
632-
G_EXEC ln -sf firmware/cmdline.txt /boot/cmdline.txt
633-
G_EXEC ln -sf firmware/config.txt /boot/config.txt
634633
G_EXEC mv "$dir/.build/images/RPi/config.txt" /boot/firmware/
635-
G_EXEC eval "echo 'root=PARTUUID=$(findmnt -Ufnro PARTUUID -M /) rootfstype=$(findmnt -Ufnro FSTYPE -M /) rootwait fsck.repair=yes net.ifnames=0 logo.nologo console=serial0,115200 console=tty1' > /boot/cmdline.txt"
634+
G_EXEC eval "echo 'root=PARTUUID=$(findmnt -Ufnro PARTUUID -M /) rootfstype=$(findmnt -Ufnro FSTYPE -M /) rootwait fsck.repair=yes net.ifnames=0 logo.nologo console=serial0,115200 console=tty1' > /boot/firmware/cmdline.txt"
636635
# Boot in 64-bit mode if this is a 64-bit image
637-
[[ $userland_arch == 'arm64' ]] && G_CONFIG_INJECT 'arm_64bit=' 'arm_64bit=1' /boot/config.txt
636+
[[ $userland_arch == 'arm64' ]] && G_CONFIG_INJECT 'arm_64bit=' 'arm_64bit=1' /boot/firmware/config.txt
638637

639638
# Odroid C1/XU4 (32-bit)
640639
elif [[ $G_HW_MODEL =~ ^(10|11)$ ]]
@@ -655,7 +654,7 @@ _EOF_
655654
G_EXEC ln -sf /etc/kernel/post{inst,rm}.d/dietpi-initramfs_cleanup
656655

657656
# SBCs using Armbian build system for kernel/bootloader packages and boot.scr
658-
elif [[ $G_HW_MODEL =~ ^(12|15|16|17|40|42|43|44|45|46|47|48|52|54|55|56|57|58|59|60|63|64|65|66|67|68|72|73|74|76|77|78|79|80|82|83|85|86|87|88|89|90|91|92|93|94|95|96|99|100|101|102|103)$ ]]
657+
elif [[ $G_HW_MODEL =~ ^(12|15|16|17|40|42|43|44|45|46|47|48|52|54|55|56|57|58|59|60|63|64|65|66|67|68|72|73|74|76|77|78|79|80|82|83|85|86|87|88|89|90|91|92|93|94|95|96|99|100|101|102|103|104)$ ]]
659658
then
660659
# Amlogic 64-bit
661660
armbian_packages=1
@@ -697,7 +696,7 @@ setenv rootuuid "true"' /boot/boot.cmd
697696
(( $G_HW_MODEL == 15 )) && G_EXEC eval 'echo '\''meson_rng'\'' > /etc/modules-load.d/dietpi-hwrng.conf'
698697

699698
# Rockchip 64-bit
700-
elif [[ $G_HW_MODEL =~ ^(42|43|46|47|55|56|58|68|72|73|76|77|78|79|80|82|85|86|87|90|91|92|93|94|95|100|101|102|103)$ ]]
699+
elif [[ $G_HW_MODEL =~ ^(42|43|46|47|55|56|58|68|72|73|76|77|78|79|80|82|85|86|87|90|91|92|93|94|95|100|101|102|103|104)$ ]]
701700
then
702701
# Load addresses
703702
G_EXEC sed --follow-symlinks -Ei '/^setenv (kernel|fdt)_addr_r/d' /boot/boot.cmd
@@ -729,6 +728,7 @@ setenv rootuuid "true"' /boot/boot.cmd
729728
esac
730729
;;
731730
85) G_CONFIG_INJECT 'fdtfile=' 'fdtfile=rockchip/rk3588s-rock-5a.dtb' /boot/dietpiEnv.txt;;
731+
104) G_CONFIG_INJECT 'fdtfile=' 'fdtfile=rockchip/rk3528-nanopi-rev01.dtb' /boot/dietpiEnv.txt;;
732732
*) :;;
733733
esac
734734
# Overlay prefix
@@ -748,6 +748,7 @@ setenv rootuuid "true"' /boot/boot.cmd
748748
87|100|101) G_CONFIG_INJECT 'overlay_prefix=' 'overlay_prefix=rockchip-rk3566 rockchip-rk3568 rockchip' /boot/dietpiEnv.txt;; # RK3566 mainline
749749
76|77) G_CONFIG_INJECT 'overlay_prefix=' 'overlay_prefix=rockchip-rk3568 rockchip' /boot/dietpiEnv.txt;; # RK3568 mainline
750750
102|103) G_CONFIG_INJECT 'overlay_prefix=' 'overlay_prefix=rk3576 rockchip' /boot/dietpiEnv.txt;; # RK3576 vendor + mainline
751+
104) G_CONFIG_INJECT 'overlay_prefix=' 'overlay_prefix=rk3528 rockchip-rk3528' /boot/dietpiEnv.txt;; # RK3528 vendor + mainline
751752
*) G_CONFIG_INJECT 'overlay_prefix=' 'overlay_prefix=rockchip' /boot/dietpiEnv.txt;;
752753
esac
753754
# Overlays
@@ -760,8 +761,9 @@ setenv rootuuid "true"' /boot/boot.cmd
760761
# shellcheck disable=SC2015
761762
case $G_HW_MODEL in
762763
73) G_CONFIG_INJECT 'consoleargs=' 'consoleargs=console=ttyS0,1500000' /boot/dietpiEnv.txt;; # headless
763-
47|55|56|100) G_CONFIG_INJECT 'consoleargs=' 'consoleargs=console=ttyS2,1500000' /boot/dietpiEnv.txt;; # headless
764+
47|55|56|100) G_CONFIG_INJECT 'consoleargs=' 'consoleargs=console=ttyS2,1500000' /boot/dietpiEnv.txt;; # headless mainline
764765
78|79|80|82|85|90|91|92|93|94|95|102|103) [[ $RK35XX_MAINLINE == 1 ]] && G_EXEC sed --follow-symlinks -i 's/ttyAML0,115200/ttyS2,1500000/' /boot/dietpiEnv.txt || G_EXEC sed --follow-symlinks -i 's/ttyAML0,115200/ttyFIQ0,1500000/' /boot/dietpiEnv.txt;; # mainline or vendor
766+
104) [[ $RK35XX_MAINLINE == 1 ]] && G_CONFIG_INJECT 'consoleargs=' 'consoleargs=console=ttyS2,1500000' /boot/dietpiEnv.txt || G_CONFIG_INJECT 'consoleargs=' 'consoleargs=console=ttyFIQ0,1500000' /boot/dietpiEnv.txt;; # headless mainline or vendor
765767
*) G_EXEC sed --follow-symlinks -i 's/ttyAML0,115200/ttyS2,1500000/' /boot/dietpiEnv.txt;; # mainline
766768
esac
767769

@@ -1026,12 +1028,13 @@ _EOF_'
10261028
'ethtool' # Force Ethernet link speed
10271029
'fake-hwclock' # Hardware clock emulation, to allow correct timestamps during boot before network time sync
10281030
'ifupdown' # Network interface configuration
1029-
'isc-dhcp-client' # DHCP client
10301031
'kmod' # "modprobe", "lsmod", used by several DietPi scripts
10311032
'rfkill' # Block/unblock WiFi and Bluetooth adapters, only installed once to unblock everything, purged afterwards!
10321033
'systemd-timesyncd' # Network time sync daemon
10331034
'usbutils' # "lsusb", used by DietPi-Software + DietPi-BugReport
10341035
)
1036+
# DHCP client: isc-dhcp-client has been removed from Forky, and we move to BusyBox's udhcpc.
1037+
(( $G_DISTRO < 9 )) && aPACKAGES_REQUIRED_INSTALL+=('isc-dhcp-client') || aPACKAGES_REQUIRED_INSTALL+=('udhcpc')
10351038

10361039
# All but VMs: Drive power management control
10371040
(( $G_HW_MODEL == 20 )) || aPACKAGES_REQUIRED_INSTALL+=('hdparm')
@@ -1181,6 +1184,7 @@ _EOF_
11811184
101) model='nanopi-r3s-lts' kernel='rockchip64';;
11821185
102) model='nanopi-r76s' kernel='rk35xx' branch='vendor';;
11831186
103) model='nanopi-m5' kernel='rk35xx' branch='vendor';;
1187+
104) model='nanopi-zero2' kernel='rk35xx' branch='vendor';;
11841188
*) :;;
11851189
esac
11861190

@@ -1229,8 +1233,11 @@ fi' /boot/boot.cmd
12291233
# Install testing kernel build if requested
12301234
if (( $TEST_KERNEL ))
12311235
then
1232-
G_EXEC_OUTPUT=1 G_EXEC curl -fo package1.deb "https://dietpi.com/downloads/binaries/testing/linux-image-$branch-$kernel.deb"
1233-
G_EXEC_OUTPUT=1 G_EXEC curl -fo package2.deb "https://dietpi.com/downloads/binaries/testing/linux-dtb-$branch-$kernel.deb"
1236+
local suffix=
1237+
# Orange Pi 5 Max/Ultra: Install kernel build with bcmdhd WiFi module configured for SDIO rather than USB
1238+
(( $G_HW_MODEL == 91 || $G_HW_MODEL == 94 )) && suffix='_bcmdhd-sdio'
1239+
G_EXEC_OUTPUT=1 G_EXEC curl -fo package1.deb "https://dietpi.com/downloads/binaries/testing/linux-image-$branch-$kernel$suffix.deb"
1240+
G_EXEC_OUTPUT=1 G_EXEC curl -fo package2.deb "https://dietpi.com/downloads/binaries/testing/linux-dtb-$branch-$kernel$suffix.deb"
12341241
G_EXEC_OUTPUT=1 G_EXEC dpkg -i package[12].deb
12351242
G_EXEC rm package[12].deb
12361243
fi
@@ -1530,7 +1537,6 @@ _EOF_
15301537
if (( $WIFI_REQUIRED ))
15311538
then
15321539
aPACKAGES_REQUIRED_INSTALL+=('iw') # Tools to configure WiFi adapters
1533-
aPACKAGES_REQUIRED_INSTALL+=('wireless-tools') # Same as "iw", deprecated but still required for non-nl80211 adapters
15341540
aPACKAGES_REQUIRED_INSTALL+=('wpasupplicant') # Support for WPA-protected WiFi network connections
15351541
aPACKAGES_REQUIRED_INSTALL+=('wireless-regdb') # Database with allowed WiFi channels based on country
15361542
fi
@@ -1997,7 +2003,7 @@ _EOF_'
19972003
# On RPi the primary serial console depends on model, use "serial0" which links to the primary console, converts to correct device on first boot
19982004
if (( $G_HW_MODEL < 10 ))
19992005
then
2000-
G_CONFIG_INJECT 'enable_uart=' 'enable_uart=1' /boot/config.txt
2006+
G_CONFIG_INJECT 'enable_uart=' 'enable_uart=1' /boot/firmware/config.txt
20012007
/boot/dietpi/func/dietpi-set_hardware serialconsole enable serial0
20022008
# Disable and mask the others explicitly to be independent of currently available serial devices
20032009
/boot/dietpi/func/dietpi-set_hardware serialconsole disable ttyAMA0
@@ -2134,6 +2140,12 @@ _EOF_
21342140
SUBSYSTEM=="leds", KERNEL=="green:lan", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth0", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1", RUN+="/bin/ip l s eth0 up", RUN+="/bin/ip l s eth0 down"
21352141
SUBSYSTEM=="leds", KERNEL=="green:wan", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth1", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1", RUN+="/bin/ip l s eth1 up", RUN+="/bin/ip l s eth1 down"
21362142
SUBSYSTEM=="leds", KERNEL=="green:wlan", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="wlan0", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1", RUN+="/bin/ip l s wlan0 up", RUN+="/bin/ip l s wlan0 down"
2143+
_EOF_
2144+
G_DIETPI-NOTIFY 2 'Assuring persistent classic Ethernet interface names: /etc/udev/rules.d/99-dietpi-nanopir5c.rules'
2145+
cat << '_EOF_' > /etc/udev/rules.d/99-dietpi-nanopir5c.rules
2146+
SUBSYSTEM=="net", KERNEL=="eth0", KERNELS=="0002:21:00.0", RUN:="/bin/true"
2147+
SUBSYSTEM=="net", KERNEL=="eth1", KERNELS=="0001:11:00.0", NAME="to_eth0", RUN:="/bin/true"
2148+
SUBSYSTEM=="net", KERNEL=="to_eth0", RUN="/bin/ip l s dev eth0 name eth1", RUN+="/bin/ip l s dev to_eth0 name eth0", RUN+="/bin/udevadm trigger -c add /sys/class/net/eth0 /sys/class/net/eth1"
21372149
_EOF_
21382150
# NanoPi R6S
21392151
elif [[ $G_HW_MODEL == 79 && $HW_VARIANT == 1 ]]

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ echo "/etc/default/$name" > "$DIR/DEBIAN/conffiles"
8888

8989
# - postinst
9090
cat << '_EOF_' > "$DIR/DEBIAN/postinst"
91-
#!/bin/sh
91+
#!/bin/dash -e
9292
if [ -d '/run/systemd/system' ]
9393
then
9494
if [ -f '/etc/default/gmediarender' ] && grep -q '\-u UUID -f HOSTNAME -I eth0' /etc/default/gmediarender
@@ -114,25 +114,26 @@ then
114114
fi
115115
116116
echo 'Configuring GMediaRender systemd service ...'
117-
systemctl unmask gmediarender
118-
systemctl enable --now gmediarender
117+
systemctl --no-reload unmask gmediarender
118+
systemctl enable gmediarender
119+
pgrep -x 'dietpi-software' > /dev/null || systemctl restart gmediarender
119120
fi
120121
_EOF_
121122

122123
# - prerm
123124
cat << _EOF_ > "$DIR/DEBIAN/prerm"
124-
#!/bin/sh
125+
#!/bin/dash -e
125126
if [ "\$1" = 'remove' ] && [ -d '/run/systemd/system' ] && [ -f '/lib/systemd/system/$name.service' ]
126127
then
127128
echo 'Deconfiguring $name_pretty systemd service ...'
128-
systemctl unmask $name
129-
systemctl disable --now $name
129+
systemctl --no-reload unmask $name
130+
systemctl --no-reload disable --now $name
130131
fi
131132
_EOF_
132133

133134
# - postrm
134135
cat << _EOF_ > "$DIR/DEBIAN/postrm"
135-
#!/bin/sh
136+
#!/bin/dash -e
136137
if [ "\$1" = 'purge' ]
137138
then
138139
if [ -d '/etc/systemd/system/$name.service.d' ]
@@ -174,15 +175,17 @@ DEPS_APT_VERSIONED=${DEPS_APT_VERSIONED%,}
174175

175176
# - Obtain version suffix
176177
G_EXEC curl -sSfo package.deb "https://dietpi.com/downloads/binaries/$G_DISTRO_NAME/${name}_$G_HW_ARCH_NAME.deb"
177-
old_version=$(dpkg-deb -f package.deb Version)
178+
old_version=$(dpkg-deb -f package.deb Version) || exit 1
178179
G_EXEC rm package.deb
179180
suffix=${old_version#*-dietpi}
180-
[[ $old_version == "$version-"* ]] && suffix="dietpi$((suffix+1))" || suffix="dietpi1"
181+
[[ $old_version == "$version-"* ]] && version+="-dietpi$((suffix+1))" || version+='-dietpi1'
182+
G_DIETPI-NOTIFY 2 "Old package version is: \e[33m${old_version:-N/A}"
183+
G_DIETPI-NOTIFY 2 "Building new package version: \e[33m$version"
181184

182185
# control
183186
cat << _EOF_ > "$DIR/DEBIAN/control"
184187
Package: $name
185-
Version: $version-$suffix
188+
Version: $version
186189
Architecture: $(dpkg --print-architecture)
187190
Maintainer: MichaIng <micha@dietpi.com>
188191
Date: $(date -uR)
@@ -204,8 +207,5 @@ G_CONFIG_INJECT 'Installed-Size: ' "Installed-Size: $(du -sk "$DIR" | mawk '{pri
204207
# Build DEB package
205208
G_EXEC_OUTPUT=1 G_EXEC dpkg-deb -b "$DIR"
206209

207-
# Cleanup
208-
G_EXEC rm -R "gmrender-resurrect-$version" "$DIR"
209-
210210
exit 0
211211
}

0 commit comments

Comments
 (0)