From 5bb1794ef3a3403abb049f85c8e394d47f82df90 Mon Sep 17 00:00:00 2001
From: Alexander Koskovich <zvnexus@outlook.com>
Date: Sat, 19 Sep 2020 01:16:52 -0700
Subject: buildkernel: Only copy DTBO if they actually exist.

Change-Id: I1f12634aa806c6f93d9819926b2ddc0aed050cf6
---
 buildkernel.sh | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/buildkernel.sh b/buildkernel.sh
index b485133..dec8d2b 100755
--- a/buildkernel.sh
+++ b/buildkernel.sh
@@ -224,15 +224,17 @@ copy_all_to_prebuilt()
 	cp -p ${OUT_DIR}/${IMAGE_FILE_PATH}/${PREBUILT_KERNEL_IMAGE} ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/${PREBUILT_KERNEL_IMAGE}
 
 	#copy dtbo images to prebuilt
-	echo "============="
-	echo "Copying target dtb/dtbo files to prebuilt"
-	if [ ! -e ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR} ]; then
-		mkdir -p ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}
-	fi
-	cp -p -r ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtb ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/
+	if [ -d ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR} ]; then
+		echo "============="
+		echo "Copying target dtb/dtbo files to prebuilt"
+		if [ ! -e ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR} ]; then
+			mkdir -p ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}
+		fi
+		cp -p -r ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtb ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/
 
-	if [ -f ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtbo ]; then
-		cp -p -r ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtbo ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/
+		if [ -f ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtbo ]; then
+			cp -p -r ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtbo ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/
+		fi
 	fi
 
 	#copy arch generated headers
@@ -297,13 +299,15 @@ copy_from_prebuilt()
 	cp -p ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/${PREBUILT_KERNEL_IMAGE} ${OUT_DIR}/${IMAGE_FILE_PATH}/${PREBUILT_KERNEL_IMAGE}
 
 	#copy dtbo images from prebuilt
-	echo "============="
-	echo "Copying dtb/dtbo files from prebuilt"
-	if [ ! -e ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR} ]; then
-		mkdir -p ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}
+	if [ -d ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR} ]; then
+		echo "============="
+		echo "Copying dtb/dtbo files from prebuilt"
+		if [ ! -e ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR} ]; then
+			mkdir -p ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}
+		fi
+		cp -p -r ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtb ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/
+		cp -p -r ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtbo ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/
 	fi
-	cp -p -r ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtb ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/
-	cp -p -r ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtbo ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/
 
 	#copy arch generated headers, and kernel generated headers
 	echo "============"
-- 
cgit v1.2.3