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

Rename REPO_* variables to FIRMWARE_REPO_*

Browse Source
This commit is contained in:
Andrew Scheller
2024-09-06 16:22:37 +01:00
committed by popcornmix
parent 096fb1a1fe
commit 3ef4adc92f
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rpi-update
View File

@@ -11,9 +11,11 @@ for i in $*; do
fi fi
done done
# REPO_URI variable is here for backwards-compatibility
REPO_URI=${REPO_URI:-"https://github.com/raspberrypi/rpi-firmware"} REPO_URI=${REPO_URI:-"https://github.com/raspberrypi/rpi-firmware"}
REPO_API_URI=${REPO_URI/github.com/api.github.com\/repos} FIRMWARE_REPO_URI=${FIRMWARE_REPO_URI:-$REPO_URI}
REPO_CONTENT_URI=${REPO_URI/github.com/raw.githubusercontent.com} FIRMWARE_REPO_API_URI=${FIRMWARE_REPO_URI/github.com/api.github.com\/repos}
FIRMWARE_REPO_CONTENT_URI=${FIRMWARE_REPO_URI/github.com/raw.githubusercontent.com}
BOOTLOADER_REPO_URI=${BOOTLOADER_REPO_URI:-"https://github.com/raspberrypi/rpi-eeprom"} BOOTLOADER_REPO_URI=${BOOTLOADER_REPO_URI:-"https://github.com/raspberrypi/rpi-eeprom"}
BOOTLOADER_REPO_API_URI=${BOOTLOADER_REPO_URI/github.com/api.github.com\/repos} BOOTLOADER_REPO_API_URI=${BOOTLOADER_REPO_URI/github.com/api.github.com\/repos}
@@ -344,7 +346,7 @@ function update_bootloader {
} }
function show_notice { function show_notice {
local NOTICE_URI=${REPO_CONTENT_URI}/${FW_REV}/NOTICE.md local NOTICE_URI=${FIRMWARE_REPO_CONTENT_URI}/${FW_REV}/NOTICE.md
local FULL_NOTICE=$(eval curl -fs ${CURL_OPTIONS} "${NOTICE_URI}") local FULL_NOTICE=$(eval curl -fs ${CURL_OPTIONS} "${NOTICE_URI}")
if [ -z "${FULL_NOTICE}" ]; then if [ -z "${FULL_NOTICE}" ]; then
return return
@@ -359,8 +361,8 @@ function show_notice {
if ${NOTICE_HASH_EXISTS}; then if ${NOTICE_HASH_EXISTS}; then
local NOTICE=$(echo "${FULL_NOTICE}" | tail -n+2) local NOTICE=$(echo "${FULL_NOTICE}" | tail -n+2)
local NEW_HASH=${FW_REV} local NEW_HASH=${FW_REV}
local LOCAL_lt_NOTICE=$(compare_hashes "${REPO_API_URI}" "${LOCAL_HASH}" lt "${NOTICE_HASH}") local LOCAL_lt_NOTICE=$(compare_hashes "${FIRMWARE_REPO_API_URI}" "${LOCAL_HASH}" lt "${NOTICE_HASH}")
local NEW_ge_NOTICE=$(compare_hashes "${REPO_API_URI}" "${NEW_HASH}" ge "${NOTICE_HASH}") local NEW_ge_NOTICE=$(compare_hashes "${FIRMWARE_REPO_API_URI}" "${NEW_HASH}" ge "${NOTICE_HASH}")
if ! ${LOCAL_lt_NOTICE} && ! ${NEW_ge_NOTICE}; then if ! ${LOCAL_lt_NOTICE} && ! ${NEW_ge_NOTICE}; then
return return
fi fi
@@ -609,7 +611,7 @@ function download_rev {
fi fi
done done
elif [[ ${SKIP_DOWNLOAD} -eq 0 ]]; then elif [[ ${SKIP_DOWNLOAD} -eq 0 ]]; then
local FW_TARBALL_URI=${REPO_URI}/tarball/${FW_REV} local FW_TARBALL_URI=${FIRMWARE_REPO_URI}/tarball/${FW_REV}
if ! eval curl -fs ${CURL_OPTIONS} --output /dev/null --head "${FW_TARBALL_URI}"; then if ! eval curl -fs ${CURL_OPTIONS} --output /dev/null --head "${FW_TARBALL_URI}"; then
echo "Invalid git hash specified" echo "Invalid git hash specified"
exit 1 exit 1
@@ -747,7 +749,7 @@ ARTIFACT=""
BUILD="" BUILD=""
FW_REV="" FW_REV=""
if [[ ${FW_REV_IN} != http* ]] && [[ ! -f ${FW_REV_IN} ]]; then if [[ ${FW_REV_IN} != http* ]] && [[ ! -f ${FW_REV_IN} ]]; then
FW_REV=$(get_long_hash "${REPO_API_URI}" "${FW_REV_IN}") FW_REV=$(get_long_hash "${FIRMWARE_REPO_API_URI}" "${FW_REV_IN}")
fi fi
echo FW_REV:$FW_REV echo FW_REV:$FW_REV
@@ -812,7 +814,7 @@ else
BOOTLOADER_LOCAL_HASH=$(cat "${BOOTLOADER_REVFILE}") BOOTLOADER_LOCAL_HASH=$(cat "${BOOTLOADER_REVFILE}")
fi fi
else else
LOCAL_HASH=$(get_long_hash ${REPO_API_URI} "$(cat "${FW_REVFILE}")") LOCAL_HASH=$(get_long_hash ${FIRMWARE_REPO_API_URI} "$(cat "${FW_REVFILE}")")
if [[ "${SKIP_BOOTLOADER}" -eq 0 ]]; then if [[ "${SKIP_BOOTLOADER}" -eq 0 ]]; then
if [[ ! -f "${BOOTLOADER_REVFILE}" ]]; then if [[ ! -f "${BOOTLOADER_REVFILE}" ]]; then
BOOTLOADER_LOCAL_HASH=0 BOOTLOADER_LOCAL_HASH=0
@@ -840,13 +842,13 @@ else
fi fi
if [[ ${JUST_CHECK} -ne 0 ]]; then if [[ ${JUST_CHECK} -ne 0 ]]; then
if $(compare_hashes "${REPO_API_URI}" "${LOCAL_HASH}" lt "${FW_REV}"); then if $(compare_hashes "${FIRMWARE_REPO_API_URI}" "${LOCAL_HASH}" lt "${FW_REV}"); then
echo " *** Firmware update required. New commits available:" echo " *** Firmware update required. New commits available:"
DIFF_URI=${REPO_API_URI}/compare/${LOCAL_HASH}...${FW_REV} DIFF_URI=${FIRMWARE_REPO_API_URI}/compare/${LOCAL_HASH}...${FW_REV}
print_diffs "${DIFF_URI}" print_diffs "${DIFF_URI}"
elif $(compare_hashes "${REPO_API_URI}" "${LOCAL_HASH}" gt "${FW_REV}"); then elif $(compare_hashes "${FIRMWARE_REPO_API_URI}" "${LOCAL_HASH}" gt "${FW_REV}"); then
echo " *** Firmware downgrade requested. Commits to drop:" echo " *** Firmware downgrade requested. Commits to drop:"
DIFF_URI=${REPO_API_URI}/compare/${FW_REV}...${LOCAL_HASH} DIFF_URI=${FIRMWARE_REPO_API_URI}/compare/${FW_REV}...${LOCAL_HASH}
print_diffs "${DIFF_URI}" print_diffs "${DIFF_URI}"
fi fi