From c9774dcfddb414b36e11cb93f3c543429ad5a38f Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Tue, 19 Jun 2018 14:08:21 +0000
Subject: main/linux-rpi: fix armhf build

---
 main/linux-rpi/APKBUILD | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD
index cd51dd2f42..68886c7c51 100644
--- a/main/linux-rpi/APKBUILD
+++ b/main/linux-rpi/APKBUILD
@@ -193,8 +193,11 @@ _package() {
 	install -D include/config/kernel.release \
 		"$_outdir"/usr/share/kernel/$_buildflavor/kernel.release
 
-	[ "$CARCH" = "aarch64" ] && mv "$INSTALL_DTBS_PATH"/broadcom/*.dtb \
-		"$INSTALL_DTBS_PATH" && rmdir "$INSTALL_DTBS_PATH"/broadcom
+	if [ "$CARCH" = "aarch64" ]; then
+		mv -f "$INSTALL_DTBS_PATH"/broadcom/*.dtb \
+			"$INSTALL_DTBS_PATH"
+		rmdir "$INSTALL_DTBS_PATH"/broadcom
+	fi
 }
 
 # main flavor installs in $pkgdir
-- 
cgit v1.2.3