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

Added support for installing a specific firmware revision

Browse Source
This commit is contained in:
Liam McLoughlin
2012-10-09 21:22:18 +01:00
parent afe5e1d454
commit 16c20612ed
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rpi-update
View File

@@ -3,17 +3,20 @@
set -o nounset set -o nounset
set -o errexit set -o errexit
REPO_URI="http://github.com/Hexxeh/rpi-firmware"
UPDATE=${UPDATE:-1} UPDATE=${UPDATE:-1}
UPDATE_URI="https://github.com/Hexxeh/rpi-update/raw/master/rpi-update" UPDATE_URI="https://github.com/Hexxeh/rpi-update/raw/master/rpi-update"
ROOT_PATH=${ROOT_PATH:-"/"} ROOT_PATH=${ROOT_PATH:-"/"}
BOOT_PATH=${BOOT_PATH:-"/boot"} BOOT_PATH=${BOOT_PATH:-"/boot"}
SKIP_KERNEL=${SKIP_KERNEL:-0} SKIP_KERNEL=${SKIP_KERNEL:-0}
FW_REPO="http://github.com/Hexxeh/rpi-firmware.git" FW_REPO="${REPO_URI}/rpi-firmware.git"
FW_REPOLOCAL="${ROOT_PATH}/root/.rpi-firmware" FW_REPOLOCAL="${ROOT_PATH}/root/.rpi-firmware"
FW_PATH="${BOOT_PATH}" FW_PATH="${BOOT_PATH}"
FW_MODPATH="${ROOT_PATH}/lib/modules" FW_MODPATH="${ROOT_PATH}/lib/modules"
FW_RAM=${1:-0} FW_RAM=${1:-0}
FW_REV=${2:-""}
GITCMD="git --git-dir=\"${FW_REPOLOCAL}/.git\" --work-tree=\"${FW_REPOLOCAL}\"" GITCMD="git --git-dir=\"${FW_REPOLOCAL}/.git\" --work-tree=\"${FW_REPOLOCAL}\""
function detect_split() { function detect_split() {
@@ -132,6 +135,8 @@ function update_repo {
echo "Failed to download updated firmware files" echo "Failed to download updated firmware files"
exit 1 exit 1
fi fi
eval ${GITCMD} reset --hard --quiet
eval ${GITCMD} clean -f -d --quiet
eval ${GITCMD} merge origin/master -m "automerge" --quiet eval ${GITCMD} merge origin/master -m "automerge" --quiet
RETVAL=$? RETVAL=$?
if [[ ${RETVAL} -ne 0 ]]; then if [[ ${RETVAL} -ne 0 ]]; then
@@ -157,6 +162,14 @@ function do_update {
fi fi
} }
function download_rev {
echo "Downloading specific firmware revision (this will take a few minutes)"
mkdir -p "${FW_REPOLOCAL}"
wget -q "${REPO_URI}/tarball/${FW_REV}" -O "${FW_REPOLOCAL}/${FW_REV}.tar.gz"
tar xzf "${FW_REPOLOCAL}/${FW_REV}.tar.gz" -C "${FW_REPOLOCAL}" --strip-components=1
rm "${FW_REPOLOCAL}/${FW_REV}.tar.gz"
}
if [[ ${EUID} -ne 0 ]]; then if [[ ${EUID} -ne 0 ]]; then
echo "This tool must be run as root" echo "This tool must be run as root"
exit 1 exit 1
@@ -206,8 +219,10 @@ if [[ ${FW_RAM} -ne 240 ]] &&[[ ${FW_RAM} -ne 224 ]] && [[ ${FW_RAM} -ne 192 ]]
exit 1 exit 1
fi fi
echo "Using ARM/GPU memory split of ${FW_RAM}MB/${FW_GPU}MB" echo "Using ARM/GPU memory split of ${FW_RAM}MB/${FW_GPU}MB"
if [[ ${FW_REV} != "" ]]; then
if [[ -f "${FW_REPOLOCAL}/.git/config" ]]; then download_rev
do_update "updated to revision ${FW_REV}"
elif [[ -f "${FW_REPOLOCAL}/.git/config" ]]; then
update_repo update_repo
if [[ -f "${FW_PATH}/.firmware_revision" ]] && [[ $(cat "${FW_PATH}/.firmware_revision") == $(eval ${GITCMD} rev-parse master) ]]; then if [[ -f "${FW_PATH}/.firmware_revision" ]] && [[ $(cat "${FW_PATH}/.firmware_revision") == $(eval ${GITCMD} rev-parse master) ]]; then
echo "Your firmware is already up to date" echo "Your firmware is already up to date"