From 5a2ec0bc552436d58127cc20e3791cb5b90fd5ba Mon Sep 17 00:00:00 2001
From: Jeroen Pluimers <jeroen.bitbucket.org@pluimers.com>
Date: Tue, 30 Aug 2016 20:52:04 +0200
Subject: [PATCH] #220 feature `SKIP_FIRMWARE`

Feature `SKIP_FIRMWARE` for #220: forces `SKIP_KERNEL=1` and also skip the `kernel.img` files and the kernel modules: This effectively only installs the userland and SDK.
---
 README.md  |   9 +++-
 rpi-update | 137 +++++++++++++++++++++++++++++------------------------
 2 files changed, 83 insertions(+), 63 deletions(-)

diff --git a/README.md b/README.md
index c06afc4..19e5b02 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Backing up before updating is always advisable.
 ## Installing
 
 ### Installing under Raspbian
- 
+
 To install the tool, run the following command:
 
     sudo apt-get install rpi-update
@@ -83,6 +83,13 @@ You can disable this behavior by:
 Will update everything **except** the `kernel.img` files and the kernel modules.
 Use with caution, some firmware updates might depend on a kernel update.
 
+#### `SKIP_FIRMWARE`
+
+    sudo SKIP_FIRMWARE=1 rpi-update
+
+Will force `SKIP_KERNEL=1 and also skip the `kernel.img` files and the kernel modules.
+This effectively only installs the userland and SDK.
+
 #### `SKIP_BACKUP`
 
     sudo SKIP_BACKUP=1 rpi-update
diff --git a/rpi-update b/rpi-update
index 5d17090..add7c56 100755
--- a/rpi-update
+++ b/rpi-update
@@ -24,6 +24,7 @@ BRANCH=${BRANCH:-"master"}
 ROOT_PATH=${ROOT_PATH:-"/"}
 BOOT_PATH=${BOOT_PATH:-"/boot"}
 WORK_PATH=${WORK_PATH:-"${ROOT_PATH}/root"}
+SKIP_FIRMWARE=${SKIP_FIRMWARE:-0}
 SKIP_KERNEL=${SKIP_KERNEL:-0}
 SKIP_SDK=${SKIP_SDK:-0}
 SKIP_REPODELETE=${SKIP_REPODELETE:-0}
@@ -72,33 +73,37 @@ EOF
 }
 
 function update_modules {
-	if [[ ${SKIP_KERNEL} -eq 0 ]]; then
-		echo " *** Updating kernel modules"
-		find "${FW_REPOLOCAL}/modules" -mindepth 1 -maxdepth 1 -type d | while read DIR; do
-			BASEDIR=$(basename "${DIR}")
-			rm -rf "${FW_MODPATH}/${BASEDIR}/kernel"
-		done
-
-		if [[ ${PRUNE_MODULES} -ne 0 ]]; then
-			find "${FW_MODPATH}" -mindepth 1 -maxdepth 1 -type d | while read DIR; do
-				COUNT=$(find ${DIR} -type f ! \( -name '*.ko' -o -name 'modules.*' \) | wc -l);
-				if [[ ${COUNT} -eq 0 ]]; then
-					echo "Pruning ${DIR}"
-					rm -rf ${DIR}
-				else
-					echo "Keeping ${DIR}"
-				fi
+	if [[ ${SKIP_FIRMWARE} -eq 0 ]]; then
+		if [[ ${SKIP_KERNEL} -eq 0 ]]; then
+			echo " *** Updating kernel modules"
+			find "${FW_REPOLOCAL}/modules" -mindepth 1 -maxdepth 1 -type d | while read DIR; do
+				BASEDIR=$(basename "${DIR}")
+				rm -rf "${FW_MODPATH}/${BASEDIR}/kernel"
 			done
-		fi
 
-		cp -R "${FW_REPOLOCAL}/modules/"* "${FW_MODPATH}/"
-		find "${FW_REPOLOCAL}/modules" -mindepth 1 -maxdepth 1 -type d | while read DIR; do
-			BASEDIR=$(basename "${DIR}")
-			echo " *** depmod ${BASEDIR}"
-			depmod -b "${ROOT_PATH}" -a "${BASEDIR}"
-		done
+			if [[ ${PRUNE_MODULES} -ne 0 ]]; then
+				find "${FW_MODPATH}" -mindepth 1 -maxdepth 1 -type d | while read DIR; do
+					COUNT=$(find ${DIR} -type f ! \( -name '*.ko' -o -name 'modules.*' \) | wc -l);
+					if [[ ${COUNT} -eq 0 ]]; then
+						echo "Pruning ${DIR}"
+						rm -rf ${DIR}
+					else
+						echo "Keeping ${DIR}"
+					fi
+				done
+			fi
+
+			cp -R "${FW_REPOLOCAL}/modules/"* "${FW_MODPATH}/"
+			find "${FW_REPOLOCAL}/modules" -mindepth 1 -maxdepth 1 -type d | while read DIR; do
+				BASEDIR=$(basename "${DIR}")
+				echo " *** depmod ${BASEDIR}"
+				depmod -b "${ROOT_PATH}" -a "${BASEDIR}"
+			done
+		else
+			echo " *** As requested, not updating kernel modules"
+		fi
 	else
-		echo " *** As requested, not updating kernel modules"
+		echo " *** As requested, not updating firmware and kernel modules"
 	fi
 }
 
@@ -170,37 +175,41 @@ function show_notice {
 }
 
 function update_firmware {
-	echo " *** Updating firmware"
-	rm -rf "${FW_PATH}/"*.elf
-	rm -rf "${FW_PATH}/"bootcode.bin
-	cp "${FW_REPOLOCAL}/"*.elf "${FW_PATH}/"
-	cp "${FW_REPOLOCAL}/"*.bin "${FW_PATH}/"
-	cp "${FW_REPOLOCAL}/"*.dat "${FW_PATH}/"
-	if [[ ${SKIP_KERNEL} -eq 0 ]]; then
-		cp "${FW_REPOLOCAL}/"*.img "${FW_PATH}/"
-		if [[ -n $(shopt -s nullglob; echo "${FW_REPOLOCAL}/"*.dtb*) ]]; then
-			cp "${FW_REPOLOCAL}/"*.dtb* "${FW_PATH}/"
+	if [[ ${SKIP_FIRMWARE} -eq 0 ]]; then
+		echo " *** Updating firmware"
+		rm -rf "${FW_PATH}/"*.elf
+		rm -rf "${FW_PATH}/"bootcode.bin
+		cp "${FW_REPOLOCAL}/"*.elf "${FW_PATH}/"
+		cp "${FW_REPOLOCAL}/"*.bin "${FW_PATH}/"
+		cp "${FW_REPOLOCAL}/"*.dat "${FW_PATH}/"
+		if [[ ${SKIP_KERNEL} -eq 0 ]]; then
+			cp "${FW_REPOLOCAL}/"*.img "${FW_PATH}/"
+			if [[ -n $(shopt -s nullglob; echo "${FW_REPOLOCAL}/"*.dtb*) ]]; then
+				cp "${FW_REPOLOCAL}/"*.dtb* "${FW_PATH}/"
+			fi
+			if [[ -n $(shopt -s nullglob; echo "${FW_REPOLOCAL}/overlays/"*.dtb*) ]]; then
+				mkdir -p "${FW_PATH}/overlays"
+				cp "${FW_REPOLOCAL}/overlays/"*.dtb* "${FW_PATH}/overlays/"
+				if [[ -f "${FW_REPOLOCAL}/overlays/README" ]]; then
+					cp "${FW_REPOLOCAL}/overlays/README" "${FW_PATH}/overlays/"
+				fi
+			fi
+		else
+			echo " *** As requested, not updating kernel"
 		fi
-		if [[ -n $(shopt -s nullglob; echo "${FW_REPOLOCAL}/overlays/"*.dtb*) ]]; then
-			mkdir -p "${FW_PATH}/overlays"
-			cp "${FW_REPOLOCAL}/overlays/"*.dtb* "${FW_PATH}/overlays/"
-			if [[ -f "${FW_REPOLOCAL}/overlays/README" ]]; then
-				cp "${FW_REPOLOCAL}/overlays/README" "${FW_PATH}/overlays/"
+		if [[ ${WANT_SYMVERS} -ne 0 ]]; then
+			if [[ -f "${FW_REPOLOCAL}/Module.symvers" ]]; then
+				cp "${FW_REPOLOCAL}/Module.symvers" "${FW_PATH}/"
+			fi
+			if [[ -f "${FW_REPOLOCAL}/Module7.symvers" ]]; then
+				cp "${FW_REPOLOCAL}/Module7.symvers" "${FW_PATH}/"
+			fi
+			if [[ -f "${FW_REPOLOCAL}/git_hash" ]]; then
+				cp "${FW_REPOLOCAL}/git_hash" "${FW_PATH}/"
 			fi
 		fi
 	else
-		echo " *** As requested, not updating kernel"
-	fi
-	if [[ ${WANT_SYMVERS} -ne 0 ]]; then
-		if [[ -f "${FW_REPOLOCAL}/Module.symvers" ]]; then
-			cp "${FW_REPOLOCAL}/Module.symvers" "${FW_PATH}/"
-		fi
-		if [[ -f "${FW_REPOLOCAL}/Module7.symvers" ]]; then
-			cp "${FW_REPOLOCAL}/Module7.symvers" "${FW_PATH}/"
-		fi
-		if [[ -f "${FW_REPOLOCAL}/git_hash" ]]; then
-			cp "${FW_REPOLOCAL}/git_hash" "${FW_PATH}/"
-		fi
+		echo " *** As requested, not updating firmware and kernel"
 	fi
 }
 
@@ -224,17 +233,21 @@ function do_backup {
 			echo " *** Remove old firmware backup"
 			rm -rf "${FW_PATH}.bak"
 		fi
-		echo " *** Backing up firmware"
-		cp -a "${FW_PATH}" "${FW_PATH}.bak"
-		if [[ ${SKIP_KERNEL} -eq 0 ]]; then
-			if [[ -d "${FW_MODPATH}.bak" ]]; then
-				echo " *** Remove old modules backup"
-				rm -rf "${FW_MODPATH}.bak"
-			fi
-			echo " *** Backing up modules $(uname -r)"
-			if [[ -d "${FW_MODPATH}/$(uname -r)" ]]; then
-				mkdir -p "${FW_MODPATH}.bak" && cp -a "${FW_MODPATH}/$(uname -r)" "${FW_MODPATH}.bak"
+		if [[ ${SKIP_FIRMWARE} -eq 0 ]]; then
+			echo " *** Backing up firmware"
+			cp -a "${FW_PATH}" "${FW_PATH}.bak"
+			if [[ ${SKIP_KERNEL} -eq 0 ]]; then
+				if [[ -d "${FW_MODPATH}.bak" ]]; then
+					echo " *** Remove old modules backup"
+					rm -rf "${FW_MODPATH}.bak"
+				fi
+				echo " *** Backing up modules $(uname -r)"
+				if [[ -d "${FW_MODPATH}/$(uname -r)" ]]; then
+					mkdir -p "${FW_MODPATH}.bak" && cp -a "${FW_MODPATH}/$(uname -r)" "${FW_MODPATH}.bak"
+				fi
 			fi
+		else
+			echo " *** As requested, not updating firmware and kernel modules"
 		fi
 	fi
 }
@@ -360,7 +373,7 @@ if [[ ! -d "${FW_PATH}" ]]; then
 	mkdir -p ${FW_PATH}
 fi
 
-if [[ ${SKIP_KERNEL} -eq 0 ]] && [[ ! -d "${FW_MODPATH}" ]]; then
+if [[ ${SKIP_KERNEL} -eq 0 && ${SKIP_FIRMWARE} -eq 0 ]] && [[ ! -d "${FW_MODPATH}" ]]; then
 	echo " !!! ${FW_MODPATH} doesn't exist - creating"
 	mkdir -p ${FW_MODPATH}
 fi