From: Sungbo Eo <mans0n@gorani.run>
Date: Sat, 4 Dec 2021 17:08:48 +0000 (+0900)
Subject: build: image: improve zip build recipe
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=446da706690a239dc7a454102db0b0a3b3a9d1ed;p=openwrt%2Fstaging%2Fmans0n.git

build: image: improve zip build recipe

* clean before build
* specify executable path
* allow adding extra options for zip
* use basename of $@

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
---

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 97176f7d7b..913e1c2411 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -524,12 +524,14 @@ define Build/xor-image
 endef
 
 define Build/zip
+	rm -rf $@.tmp
 	mkdir $@.tmp
-	mv $@ $@.tmp/$(1)
+	mv $@ $@.tmp/$(word 1,$(1))
 
-	zip -j -X \
+	$(STAGING_DIR_HOST)/bin/zip -j -X \
 		$(if $(SOURCE_DATE_EPOCH),--mtime="$(SOURCE_DATE_EPOCH)") \
-		$@ $@.tmp/$(if $(1),$(1),$@)
+		$(wordlist 2,$(words $(1)),$(1)) \
+		$@ $@.tmp/$(if $(word 1,$(1)),$(word 1,$(1)),$$(basename $@))
 	rm -rf $@.tmp
 endef