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: Only update 32/64 bit kernel and modules if currently present

Browse Source 
We've seen reports of 64-bit distributions that rely on the absence of a 32-bit kernel
to get firmware to switch to 64-bit mode (rather that explicitly using arm_64bit=1),
and that assumption is broken when adding 32-bit kernels to the boot directory

Signed-off-by: Dom Cobley <popcornmix@gmail.com>
This commit is contained in:
Dom Cobley
2022-11-18 16:27:09 +00:00
parent 9c9259c0ca
commit e282169788
1 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
rpi-update
View File

@@ -51,7 +51,6 @@ SKIP_DOWNLOAD=${SKIP_DOWNLOAD:-0}
SKIP_WARNING=${SKIP_WARNING:-0} SKIP_WARNING=${SKIP_WARNING:-0}
SKIP_CHECK_PARTITION=${SKIP_CHECK_PARTITION:-0} SKIP_CHECK_PARTITION=${SKIP_CHECK_PARTITION:-0}
WANT_SYMVERS=${WANT_SYMVERS:-0} WANT_SYMVERS=${WANT_SYMVERS:-0}
WANT_PI4=${WANT_PI4:-0}
PRUNE_MODULES=${PRUNE_MODULES:-0} PRUNE_MODULES=${PRUNE_MODULES:-0}
RPI_UPDATE_UNSUPPORTED=${RPI_UPDATE_UNSUPPORTED:-0} RPI_UPDATE_UNSUPPORTED=${RPI_UPDATE_UNSUPPORTED:-0}
JUST_CHECK=${JUST_CHECK:-0} JUST_CHECK=${JUST_CHECK:-0}
@@ -149,13 +148,20 @@ function update_modules {
find "${FW_REPOLOCAL}/modules" -mindepth 1 -maxdepth 1 -type d | while read DIR; do find "${FW_REPOLOCAL}/modules" -mindepth 1 -maxdepth 1 -type d | while read DIR; do
BASEDIR="$(basename "${DIR}")" BASEDIR="$(basename "${DIR}")"
if [[ ${WANT_PI4} -ne 1 ]]; then # get the v7l from 5.15.78-v7l+ and null from 5.15.78+
ENDSWITH=${BASEDIR: -4} VERSION=$(echo $BASEDIR | cut -sd "-" -f2)
if [[ "${ENDSWITH}" == "v7l+" ]]; then if [[ ${WANT_32BIT} -ne 1 ]]; then
if [[ "${VERSION}" == "" ]] || [[ "${VERSION}" == "v7+" ]] || [[ "${VERSION}" == "v7l+" ]]; then
continue; continue;
fi fi
ENDSWITH=${BASEDIR: -3} fi
if [[ "${ENDSWITH}" == "v8+" ]]; then if [[ ${WANT_64BIT} -ne 1 ]]; then
if [[ "${VERSION}" == "v8+" ]]; then
continue;
fi
fi
if [[ ${WANT_PI4} -ne 1 ]]; then
if [[ "${VERSION}" == "v7l+" ]]; then
continue; continue;
fi fi
fi fi
@@ -336,6 +342,7 @@ function check_partition {
function update_firmware { function update_firmware {
echo " *** Updating firmware" echo " *** Updating firmware"
rm -rf "${FW_PATH}/"start*.elf rm -rf "${FW_PATH}/"start*.elf
rm -rf "${FW_PATH}/"fixup*.dat
rm -rf "${FW_PATH}/"bootcode.bin rm -rf "${FW_PATH}/"bootcode.bin
if [[ ${WANT_PI4} -eq 1 ]]; then if [[ ${WANT_PI4} -eq 1 ]]; then
cp "${FW_REPOLOCAL}/"start*.elf "${FW_PATH}/" cp "${FW_REPOLOCAL}/"start*.elf "${FW_PATH}/"
@@ -346,10 +353,14 @@ function update_firmware {
fi fi
cp "${FW_REPOLOCAL}/"*.bin "${FW_PATH}/" cp "${FW_REPOLOCAL}/"*.bin "${FW_PATH}/"
if [[ ${SKIP_KERNEL} -eq 0 ]]; then if [[ ${SKIP_KERNEL} -eq 0 ]]; then
if [[ ${WANT_PI4} -eq 1 ]]; then if [[ ${WANT_32BIT} -eq 1 ]]; then
cp "${FW_REPOLOCAL}/"*.img "${FW_PATH}/"
else
cp "${FW_REPOLOCAL}/"kernel.img "${FW_REPOLOCAL}/"kernel7.img "${FW_PATH}/" cp "${FW_REPOLOCAL}/"kernel.img "${FW_REPOLOCAL}/"kernel7.img "${FW_PATH}/"
if [[ ${WANT_PI4} -eq 1 ]]; then
cp "${FW_REPOLOCAL}/"kernel7l.img "${FW_PATH}/"
fi
fi
if [[ ${WANT_64BIT} -eq 1 ]]; then
cp "${FW_REPOLOCAL}/"kernel8.img "${FW_PATH}/"
fi fi
if [[ -n $(shopt -s nullglob; echo "${FW_REPOLOCAL}/"*.dtb*) ]]; then if [[ -n $(shopt -s nullglob; echo "${FW_REPOLOCAL}/"*.dtb*) ]]; then
cp "${FW_REPOLOCAL}/"*.dtb* "${FW_PATH}/" cp "${FW_REPOLOCAL}/"*.dtb* "${FW_PATH}/"
@@ -416,9 +427,22 @@ function do_backup {
} }
function do_update { function do_update {
if [ -f ${FW_PATH}/kernel7l.img ] || [ -f ${FW_PATH}/kernel8.img ]; then if [ -f ${FW_PATH}/kernel.img ] || [ -f ${FW_PATH}/kernel7.img ]; then
WANT_PI4=1 WANT_32BIT=${WANT_32BIT:-1}
fi fi
if [ -f ${FW_PATH}/kernel7l.img ]; then
WANT_32BIT=${WANT_32BIT:-1}
fi
if [ -f ${FW_PATH}/kernel8.img ]; then
WANT_64BIT=${WANT_64BIT:-1}
fi
if [ -f ${FW_PATH}/start4.elf ]; then
WANT_PI4=${WANT_PI4:-1}
fi
WANT_32BIT=${WANT_32BIT:-0}
WANT_64BIT=${WANT_64BIT:-0}
WANT_PI4=${WANT_PI4:-0}
echo "WANT_32BIT:${WANT_32BIT} WANT_64BIT:${WANT_64BIT} WANT_PI4:${WANT_PI4}"
if [[ ${WANT_PI4} -eq 1 ]]; then if [[ ${WANT_PI4} -eq 1 ]]; then
check_partition check_partition
fi fi