[openwrt/openwrt] build: image: improve zip build recipe

[LEDE Commits]

mans0n pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/446da706690a239dc7a454102db0b0a3b3a9d1ed

commit 446da706690a239dc7a454102db0b0a3b3a9d1ed
Author: Sungbo Eo <mans0n at gorani.run>
AuthorDate: Sun Dec 5 02:08:48 2021 +0900

    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 at gorani.run>
---
 include/image-commands.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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