raspberrypi/rpi-update
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-update.git synced 2026-01-20 21:13:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

rpi-update: Allow some explicit non-custom kernels (#20)

Browse Source 
rpi-update tries to avoid rendering a Pi non-bootable by detecting
when a custom kernel is being used. Since dtb filenames are not
qualified with the kernel name, overwriting the dtb files for a
custom kernel but leaving the custom kernel unchanged may stop the
Pi booting.

However, adding kernel=kernel8.img to config.txt is a way to select a
kernel with 4kB pages on a Pi 5. Treat kernel8.img and kernel_2712.img
as non-custom kernels, and also allow SKIP_KERNEL=0 to be used to
force the kernel to be updated.
This commit is contained in:
Phil Elwell
2023-10-13 15:42:15 +01:00
committed by GitHub
parent fc0d8daaf7
commit cf120f0a76
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rpi-update
View File

@@ -54,7 +54,7 @@ else
BOOT_PATH=${BOOT_PATH:-"/boot"} BOOT_PATH=${BOOT_PATH:-"/boot"}
fi fi
WORK_PATH=${WORK_PATH:-"${ROOT_PATH}/root"} WORK_PATH=${WORK_PATH:-"${ROOT_PATH}/root"}
SKIP_KERNEL=${SKIP_KERNEL:-0} SKIP_KERNEL=${SKIP_KERNEL:-}
SKIP_FIRMWARE=${SKIP_FIRMWARE:-0} SKIP_FIRMWARE=${SKIP_FIRMWARE:-0}
SKIP_SDK=${SKIP_SDK:-0} SKIP_SDK=${SKIP_SDK:-0}
SKIP_VCLIBS=${SKIP_VCLIBS:-0} SKIP_VCLIBS=${SKIP_VCLIBS:-0}
@@ -82,8 +82,16 @@ SELFUPDATE_SCRIPT="${WORK_PATH}/.updateScript.sh"
[ "${RPI_UPDATE_UNSUPPORTED}" -ne 0 ] && echo -e "You appear to be trying to update firmware on an incompatible distribution. To force update, run the following:\nsudo -E RPI_UPDATE_UNSUPPORTED=0 rpi-update" && exit 1 [ "${RPI_UPDATE_UNSUPPORTED}" -ne 0 ] && echo -e "You appear to be trying to update firmware on an incompatible distribution. To force update, run the following:\nsudo -E RPI_UPDATE_UNSUPPORTED=0 rpi-update" && exit 1
if command -v vcgencmd > /dev/null; then if [[ "$SKIP_KERNEL" == "" ]]; then
vcgencmd get_config str | grep -qE "^kernel=" && echo -e "You appear to be using a custom kernel file.\nSkipping installation of new kernel, as bundled dtb files may be incompatible with your kernel." && SKIP_KERNEL=1 SKIP_KERNEL=0
if command -v vcgencmd > /dev/null; then
KERNEL=$(vcgencmd get_config str | grep -E "^kernel=" | cut -d= -f2)
case $KERNEL in
"" | kernel8.img | kernel_2712.img) ;;
*) echo -e "You appear to be using a custom kernel file (kernel=$KERNEL in config.txt).\nSkipping installation of new kernel, as bundled dtb files may be incompatible with your kernel." && SKIP_KERNEL=1
sleep 1
esac
fi
fi fi
# Always follow redirects # Always follow redirects