From a1fb550f9046feb43b1efd4f27b0329b5e66f060 Mon Sep 17 00:00:00 2001
From: Andrew Scheller <github@loowis.durge.org>
Date: Mon, 2 Sep 2013 10:24:23 +0100
Subject: [PATCH] Separate updating of vc_libs and sdk, allow sdk to be skipped

---
 rpi-update | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/rpi-update b/rpi-update
index 8b32e46..b643eda 100755
--- a/rpi-update
+++ b/rpi-update
@@ -19,6 +19,7 @@ ROOT_PATH=${ROOT_PATH:-"/"}
 BOOT_PATH=${BOOT_PATH:-"/boot"}
 WORK_PATH=${WORK_PATH:-"${ROOT_PATH}/root"}
 SKIP_KERNEL=${SKIP_KERNEL:-0}
+SKIP_SDK=${SKIP_SDK:-0}
 RPI_UPDATE_UNSUPPORTED=${RPI_UPDATE_UNSUPPORTED:-0}
 FW_REPO="${REPO_URI}.git"
 FW_REPOLOCAL="${WORK_PATH}/.rpi-firmware"
@@ -71,8 +72,8 @@ function update_modules {
 	fi
 }
 
-function update_sdk {
-	echo " *** Updating SDK"
+function update_vc_libs {
+	echo " *** Updating VideoCore libraries"
 
 	ELFOUTPUT=$(readelf -a "${ROOT_PATH}/bin/bash")
 	if [ "${ELFOUTPUT}" != "${ELFOUTPUT/VFP_args/}" ]; then
@@ -82,7 +83,15 @@ function update_sdk {
 		echo " *** Using SoftFP libraries"
 		cp -vR "${FW_REPOLOCAL}/vc/softfp/"* "${ROOT_PATH}/"
 	fi
-	cp -vR "${FW_REPOLOCAL}/vc/sdk/"* "${ROOT_PATH}/"
+}
+
+function update_sdk {
+	if [[ ${SKIP_SDK} -eq 0 ]]; then
+		echo " *** Updating SDK"
+		cp -vR "${FW_REPOLOCAL}/vc/sdk/"* "${ROOT_PATH}/"
+	else
+		echo " *** As requested, not updating SDK"
+	fi
 }
 
 function update_firmware {
@@ -148,6 +157,7 @@ function do_backup {
 function do_update {
 	update_firmware
 	update_modules
+	update_vc_libs
 	update_sdk
 	finalise
 	echo " *** If no errors appeared, your firmware was successfully $1"