gemini: follow common pattern for temp dir naming

[openwrt/staging/mkresin.git] / target / linux / gemini / image / Makefile

diff --git a/target/linux/gemini/image/Makefile b/target/linux/gemini/image/Makefile
index c08ea5d5eb4cefcc2f3a94f606e2a11d9f1c5504..a55a89070076d70e85474f77bb47d1d1ab7243b0 100644 (file)
--- a/target/linux/gemini/image/Makefile
+++ b/target/linux/gemini/image/Makefile
@@ -38,7 +38,9 @@ define Build/dns313-images
        dns313-header $(IMAGE_KERNEL) \
                $@.tmp/.boot/zImage
 
-       tar -czf $@ -C @.tmp .boot
+       tar --sort=name --owner=0 --group=0 --numeric-owner -czf $@ \
+               -C $@.tmp .boot \
+               $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)")
 
        rm -rf $@.tmp
 endef
@@ -51,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
-       dd if=$(IMAGE_ROOTFS) of=$@-tmp/rd.gz bs=6144k conv=sync
-       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 --owner=0 --group=0 --numeric-owner --mtime=@$(SOURCE_DATE_EPOCH) \
-                       -czf $@ ImageInfo zImage rd.gz hddapp.tgz)
-       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 $@ * \
+               $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)"))
+
+       rm -rf $@.tmp
 endef
 
 # WBD-111 and WBD-222:
@@ -118,7 +122,7 @@ define Device/nas4220b-sq201
        ARTIFACT/zImage := append-kernel
        IMAGES += rd.gz sysupgrade.tar.gz
        IMAGE/rd.gz := append-rootfs | pad-to 6144k
-       IMAGE/sysupgrade.tar.gz := nas4220b-sq201-images $(1)
+       IMAGE/sysupgrade.tar.gz := append-rootfs | pad-to 6144k | nas4220b-sq201-images $(1)
        DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES)
 endef