gemini: use existing build code where possible

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

diff --git a/target/linux/gemini/image/Makefile b/target/linux/gemini/image/Makefile
index f3086dee78df699239edd7c7234fb46171f21fb3..469e2b0a536da88c62f2c76a5c96940335bdb928 100644 (file)
--- a/target/linux/gemini/image/Makefile
+++ b/target/linux/gemini/image/Makefile
@@ -27,18 +27,22 @@ 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 --sort=name --owner=0 --group=0 --numeric-owner -czf $@ \
+               -C $@.tmp .boot \
+               $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)")
+
+       rm -rf $@.tmp
 endef
 
 # Create the special NAS4220B and Itian Square One SQ201 image
@@ -51,12 +55,12 @@ endef
 define Build/nas4220b-sq201-images
        rm -rf $@-tmp
        mkdir -p $@-tmp
-       dd if=$(IMAGE_ROOTFS) of=$@-tmp/rd.gz bs=6144k conv=sync
+       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 --owner=0 --group=0 --numeric-owner --mtime=@$(SOURCE_DATE_EPOCH) \
-                       -czf $@ ImageInfo zImage rd.gz hddapp.tgz)
+       (cd $@-tmp; tar --sort=name --owner=0 --group=0 --numeric-owner -czf $@ * \
+               $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)"))
        rm -rf $@-tmp
 endef
 
@@ -116,7 +120,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