From: Mathias Kresin <dev@kresin.me>
Date: Fri, 25 Jan 2019 20:49:46 +0000 (+0100)
Subject: gemini: follow common pattern for temp dir naming
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=10dab9b0986cda87060f8a2bf28bbac468488734;p=openwrt%2Fstaging%2Fdedeckeh.git

gemini: follow common pattern for temp dir naming

For temporary directories <imagename>.tmp is a common pattern in image
build code across the tree. Use it for the nas4220b/sq201 recipe as
well.

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

diff --git a/target/linux/gemini/image/Makefile b/target/linux/gemini/image/Makefile
index 469e2b0a53..a55a890700 100644
--- a/target/linux/gemini/image/Makefile
+++ b/target/linux/gemini/image/Makefile
@@ -53,15 +53,17 @@ endef
 # there when using OpenWRT. We just use that to create the
 # "sysupgrade" firmware image.
 define Build/nas4220b-sq201-images
-	rm -rf $@-tmp
-	mkdir -p $@-tmp
-	mv $@ $@-tmp/rd.gz
-	dd if=/dev/zero of=$@-tmp/hddapp.tgz bs=6144k count=1
-	cp $(IMAGE_KERNEL) $@-tmp/zImage
-	cp ./ImageInfo-$(1) $@-tmp/ImageInfo
-	(cd $@-tmp; tar --sort=name --owner=0 --group=0 --numeric-owner -czf $@ * \
+	mkdir -p $@.tmp
+
+	mv $@ $@.tmp/rd.gz
+	dd if=/dev/zero of=$@.tmp/hddapp.tgz bs=6144k count=1
+	cp $(IMAGE_KERNEL) $@.tmp/zImage
+	cp ./ImageInfo-$(1) $@.tmp/ImageInfo
+
+	(cd $@.tmp; tar --sort=name --owner=0 --group=0 --numeric-owner -czf $@ * \
 		$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)"))
-	rm -rf $@-tmp
+
+	rm -rf $@.tmp
 endef
 
 # WBD-111 and WBD-222: