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

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	README.md
	rpi-update
This commit is contained in:
James Nylen
2012-12-31 17:35:48 +00:00
parent 4652f64a4d de54b22c4e
commit 6f6801552c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rpi-update
View File

@@ -17,12 +17,14 @@ fi
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}
RPI_UPDATE_UNSUPPORTED=${RPI_UPDATE_UNSUPPORTED:-0}
FW_REPO="${REPO_URI}.git" FW_REPO="${REPO_URI}.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_REV=${1:-""} FW_REV=${1:-""}
GITCMD="git --git-dir=\"${FW_REPOLOCAL}/.git\" --work-tree=\"${FW_REPOLOCAL}\"" GITCMD="git --git-dir=\"${FW_REPOLOCAL}/.git\" --work-tree=\"${FW_REPOLOCAL}\""
[ "${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
function update_self() { function update_self() {
echo " *** Performing self-update" echo " *** Performing self-update"
@@ -110,8 +112,10 @@ function finalise {
fi fi
echo " *** Running ldconfig" echo " *** Running ldconfig"
ldconfig -r "${ROOT_PATH}" ldconfig -r "${ROOT_PATH}"
echo " *** Storing current firmware revision" if [[ ${FW_REV} == "" ]]; then
eval ${GITCMD} rev-parse master > "${FW_PATH}/.firmware_revision" echo " *** Storing current firmware revision"
eval ${GITCMD} rev-parse master > "${FW_PATH}/.firmware_revision"
fi
echo " *** Syncing changes to disk" echo " *** Syncing changes to disk"
sync sync
} }