From: Mathias Kresin <dev@kresin.me>
Date: Fri, 25 Jan 2019 20:48:10 +0000 (+0100)
Subject: gemini: use existing build code where possible
X-Git-Tag: v19.07.0-rc1~1502
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=98c2261ac21550b7c7bdfddc0ada508f3d7a08b4;p=oweals%2Fopenwrt.git

gemini: use existing build code where possible

Use the existing image build recipes in favour of introducing deplicate
shell code.

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

diff --git a/target/linux/gemini/image/Makefile b/target/linux/gemini/image/Makefile
index 773fe1e4bc..469e2b0a53 100644
--- a/target/linux/gemini/image/Makefile
+++ b/target/linux/gemini/image/Makefile
@@ -55,7 +55,7 @@ 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
@@ -120,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