From: Mathias Kresin <dev@kresin.me>
Date: Fri, 25 Jan 2019 20:39:49 +0000 (+0100)
Subject: gemini: build images in temporary directories
X-Git-Tag: v19.07.0-rc1~1504
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6491643df4595262fbb2387327a01e16523b58ba;p=oweals%2Fopenwrt.git

gemini: build images in temporary directories

Create files in temporary directories within the build directory
instead manipulating files in the (final) output directory.

Signed-off-by: Mathias Kresin <dev@kresin.me>
---

diff --git a/target/linux/gemini/image/Makefile b/target/linux/gemini/image/Makefile
index f3086dee78..c08ea5d5eb 100644
--- a/target/linux/gemini/image/Makefile
+++ b/target/linux/gemini/image/Makefile
@@ -27,18 +27,20 @@ endef
 # to satisfy the boot loader on the device. The zImage is
 # the only real content.
 define Build/dns313-images
-	if [ -d $(BIN_DIR)/.boot ] ; then rm -rf $(BIN_DIR)/.boot ; fi
-	mkdir -p $(BIN_DIR)/.boot
-	echo "dummy" > $(BIN_DIR)/.boot/dummyfile
-	dns313-header $(BIN_DIR)/.boot/dummyfile \
-		$(BIN_DIR)/.boot/rootfs.tgz
-	dns313-header $(BIN_DIR)/.boot/dummyfile \
-		$(BIN_DIR)/.boot/rd.gz
+	mkdir -p $@.tmp/.boot
+
+	echo "dummy" > $@.tmp/dummyfile
+
+	dns313-header $@.tmp/dummyfile \
+		$@.tmp/.boot/rootfs.tgz
+	dns313-header $@.tmp/dummyfile \
+		$@.tmp/.boot/rd.gz
 	dns313-header $(IMAGE_KERNEL) \
-		$(BIN_DIR)/.boot/zImage
-	rm -f $(BIN_DIR)/.boot/dummyfile
-	(cd $(BIN_DIR); tar -czf $@ .boot)
-	if [ -d $(BIN_DIR)/.boot ] ; then rm -rf $(BIN_DIR)/.boot ; fi
+		$@.tmp/.boot/zImage
+
+	tar -czf $@ -C @.tmp .boot
+
+	rm -rf $@.tmp
 endef
 
 # Create the special NAS4220B and Itian Square One SQ201 image