Skip to content

Commit

Permalink
v9.8
Browse files Browse the repository at this point in the history
- Raspberry Pi firmware migration | switch to raspi-utils-core, which excludes a lot of optional developer-directed features, but includes vcgencmd, which is what we need.
  • Loading branch information
MichaIng committed Sep 3, 2024
1 parent dc1793b commit d1916b0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .build/images/dietpi-installer
Original file line number Diff line number Diff line change
Expand Up @@ -1277,7 +1277,7 @@ _EOF_
# tiny-initramfs to satisfy dependency: https://github.com/RPi-Distro/repo/issues/358
G_AGI raspi-firmware
G_CONFIG_INJECT 'SKIP_INITRAMFS_GEN=' 'SKIP_INITRAMFS_GEN=yes' /etc/default/raspi-firmware
G_AGI "${kernel[@]}" raspi-utils raspberrypi-sys-mods raspberrypi-archive-keyring "${a32bit[@]}" tiny-initramfs
G_AGI "${kernel[@]}" raspi-utils-core raspberrypi-sys-mods raspberrypi-archive-keyring "${a32bit[@]}" tiny-initramfs
G_EXEC apt-mark auto tiny-initramfs
G_EXEC rm -f /boot/initrd.img-* /boot/firmware/initramfs*
else
Expand Down
3 changes: 2 additions & 1 deletion .update/patches
Original file line number Diff line number Diff line change
Expand Up @@ -1788,7 +1788,7 @@ Patch_9_7()
esac
fi

# NanoPi R5S/R6S migration from legacy image with 8 partitions to Armbian-based kernel and bootloader
# NanoPi R5S/R5C migration from legacy image with 8 partitions to Armbian-based kernel and bootloader
elif [[ $G_HW_MODEL == 76 ]] && dpkg-query -s 'firmware-nanopi5' &> /dev/null
then
local rmodel
Expand Down Expand Up @@ -1866,6 +1866,7 @@ Patch_9_7()
done
fi

# NanoPi 6 series migration from legacy image with 8 partitions to Armbian-based kernel and bootloader
elif [[ $G_HW_MODEL == 79 ]] && dpkg-query -s 'firmware-nanopi6' &> /dev/null
then
local rmodel
Expand Down
2 changes: 1 addition & 1 deletion dietpi/func/dietpi-set_software
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ deb $INPUT_MODE_VALUE $G_DISTRO_NAME-backports main contrib non-free' > /etc/apt
\n- $optional for ${models[$optional]}" && to_install=("$optional") || to_remove=("$optional")
fi

G_AGI "$kernel_package" "${to_install[@]}" raspi-firmware raspi-utils tiny-initramfs
G_AGI "$kernel_package" "${to_install[@]}" raspi-firmware raspi-utils-core tiny-initramfs
G_AGP "${to_remove[@]}" raspberrypi-kernel raspberrypi-headers-kernel raspberrypi-bootloader libraspberrypi-bin libraspberrypi0
}

Expand Down

0 comments on commit d1916b0

Please sign in to comment.