From ef186b90dad073d8f5b6643fad91bb2f627cce80 Mon Sep 17 00:00:00 2001
From: Dom Cobley <popcornmix@gmail.com>
Date: Tue, 30 Jan 2024 20:13:29 +0000
Subject: [PATCH] rpi-update: Skip updates to /opt if not in repo

The /opt tree is a build of the userland repo which is deprecated,
and is no longer provided by firmware/rpi-firmware repos.

Handle skipping these if they are missing.
---
 rpi-update | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/rpi-update b/rpi-update
index dfc6b10..b4443fb 100755
--- a/rpi-update
+++ b/rpi-update
@@ -223,18 +223,24 @@ function update_vc_libs {
 	fi
 	if [[ "${ELFOUTPUT}" != "${ELFOUTPUT/VFP_args/}" || \
 			"${ELFOUTPUT}" != "${ELFOUTPUT/hard-float/}" ]]; then
-		echo " *** Using HardFP libraries"
-		cp -R "${FW_REPOLOCAL}/vc/hardfp/"* "${ROOT_PATH}/"
+		if [ -d "${FW_REPOLOCAL}/vc/hardfp/" ]; then
+			echo " *** Using HardFP libraries"
+			cp -R "${FW_REPOLOCAL}/vc/hardfp/"* "${ROOT_PATH}/"
+		fi
 	else
-		echo " *** Using SoftFP libraries"
-		cp -R "${FW_REPOLOCAL}/vc/softfp/"* "${ROOT_PATH}/"
+		if [ -d "${FW_REPOLOCAL}/vc/softfp/" ]; then
+			echo " *** Using SoftFP libraries"
+			cp -R "${FW_REPOLOCAL}/vc/softfp/"* "${ROOT_PATH}/"
+		fi
 	fi
 }
 
 function update_sdk {
 	if [[ ${SKIP_SDK} -eq 0 ]]; then
-		echo " *** Updating SDK"
-		cp -R "${FW_REPOLOCAL}/vc/sdk/"* "${ROOT_PATH}/"
+		if [ -d "${FW_REPOLOCAL}/vc/sdk/" ]; then
+			echo " *** Updating SDK"
+			cp -R "${FW_REPOLOCAL}/vc/sdk/"* "${ROOT_PATH}/"
+		fi
 	else
 		echo " *** As requested, not updating SDK"
 	fi