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 <[email protected]>

include/image-commands.mk

@@ -524,12 +524,14 @@ define Build/xor-image
 endef
 
 define Build/zip
+	rm -rf [email protected]
 	mkdir [email protected]
-	mv $@ [email protected]/$(1)
+	mv $@ [email protected]/$(word 1,$(1))
 
-	zip -j -X \
+	$(STAGING_DIR_HOST)/bin/zip -j -X \
 		$(if $(SOURCE_DATE_EPOCH),--mtime="$(SOURCE_DATE_EPOCH)") \
-		$@ [email protected]/$(if $(1),$(1),$@)
+		$(wordlist 2,$(words $(1)),$(1)) \
+		$@ [email protected]/$(if $(word 1,$(1)),$(word 1,$(1)),$$(basename $@))
 	rm -rf [email protected]
 endef