core/linux-rpi-16k to 6.6.6-2

Upstream bump and modernize and rework $pkgname.install to use EOF
statements and add warning to users of other RPi boards that this
package is incompatible with their hardware/might avoid some grief
This commit is contained in:
graysky 2023-12-13 06:40:34 -05:00
parent 534261c88c
commit 62e049806b
3 changed files with 42 additions and 32 deletions

View file

@ -7,12 +7,12 @@
buildarch=8
pkgbase=linux-rpi-16k
_commit=392b3e83bcd5353494c3344b5b0d75b7763675e7
_commit=060ef4ec12dcfc62a2cb4eec51b604eb69a8907d
_srcname=linux-${_commit}
_kernelname=${pkgbase#linux}
_regen=
pkgver=6.6.6
pkgrel=1
pkgrel=2
pkgdesc='Linux'
url="https://github.com/raspberrypi/linux"
arch=(aarch64)
@ -33,10 +33,10 @@ source=("linux-$pkgver-${_commit:0:10}.tar.gz::https://github.com/raspberrypi/li
90-linux.hook
archarm.diffconfig
)
md5sums=('61748f81151aedbf47c6fc3b2fae90e8'
md5sums=('dcdff38f47424c17480a3c575643fdc5'
'3bab7426d8c8818dda8353da3892a41f'
'16c484af9f72b9275afcf83a6b8eab36'
'4cbed2795359a053fce9098da15d4588'
'aa9d90e1408915cb67255d631c14bc9f'
'f66a7ea3feb708d398ef57e4da4815e9'
'86d4a35722b5410e3b29fc92dae15d4b'
'0a5f16bfec6ad982a2f6782724cca8ba'

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.6.5 Kernel Configuration
# Linux/arm64 6.6.6 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@ -3571,8 +3571,11 @@ CONFIG_TCG_TIS_I2C=m
# CONFIG_TCG_VTPM_PROXY is not set
# CONFIG_TCG_TIS_ST33ZP24_I2C is not set
# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
# CONFIG_XILLYBUS is not set
# CONFIG_XILLYUSB is not set
CONFIG_XILLYBUS_CLASS=m
CONFIG_XILLYBUS=m
CONFIG_XILLYBUS_PCIE=m
# CONFIG_XILLYBUS_OF is not set
CONFIG_XILLYUSB=m
CONFIG_RASPBERRYPI_GPIOMEM=m
# end of Character devices

View file

@ -1,8 +1,12 @@
disable_cma() {
if [[ -f /boot/config.txt && $(grep '^cma' /boot/config.txt) != '' ]]; then
echo ">>> You appear to have dynamic memory (CMA) enabled, which is currently broken"
echo ">>> in newer kernels and will cause many issues if left enabled."
echo ">>> Disabling that for you now."
cat <<END
>>> You appear to have dynamic memory (CMA) enabled, which is currently broken
in newer kernels and will cause many issues if left enabled. Disabling that
for you now.
END
sed -i 's/^cma_/#cma_/g' /boot/config.txt
fi
}
@ -16,35 +20,38 @@ correct_fstab() {
fi
}
post_install () {
disable_cma
check_not_rpi5() {
if [[ -f /sys/firmware/devicetree/base/model ]]; then
if ! grep -a -q 5 /sys/firmware/devicetree/base/model; then
cat <<END
# coming from linux-aarch64 also needs a padded zero in the path to /boot
correct_fstab
>>> WARNING: You appear to have installed linux-rpi-16k on incompatible hardware!
Rebooting will likely render this system unbootable!
Highly recommend installing linux-rpi before you reboot!
END
fi
fi
}
post_install () {
post_upgrade
}
post_upgrade() {
if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then
if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then
echo "WARNING: /boot appears to be a separate partition but is not mounted."
echo " You probably just broke your system. Congratulations."
fi
fi
check_not_rpi5
correct_fstab
disable_cma
if [ "$(vercmp $2 3.18.3)" -lt 0 ]; then
echo "________________________________________________________________________________"
echo ""
echo "WARNING: This kernel provides updated config.txt and cmdline.txt files."
echo " Check for pacnew files in /boot and merge or replace the existing files"
echo " with the new versions."
echo "________________________________________________________________________________"
echo ""
fi
if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then
if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then
cat <<END
if [ "$(vercmp $2 5.10.0)" -lt 0 ]; then
correct_fstab
>>> WARNING: /boot appears to be a separate partition but is not mounted.
You probably just broke your system. Congratulations.
END
fi
fi
}