* clean before build * specify executable path * allow adding extra options for zip * use basename of $@
Signed-off-by: Sungbo Eo <[email protected]> --- Actually I failed to reproduce any evidence that `$(STAGING_DIR_HOST)/bin/zip` is indeed necessary. But I added it for consistency with other recipes. Ref: b993b68b6ca8 ("build: introduce $(MKHASH)") 33411ee9190b ("target/x86/image: use qemu-img from STAGING_DIR_HOST") 26a016731d1f ("firmware-utils: mksercommfw: overhaul image creation") --- 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 f0557936c9..4c5fe32e24 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 [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 -- 2.25.1 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
