extras/CustomTarget_templates.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 190ccb653955fa1d23e7c0d3bf5e47769a73ba30
Author: Laurent Balland <laurent.ball...@mailo.fr>
AuthorDate: Fri Nov 1 18:27:51 2024 +0100
Commit: Laurent Balland <laurent.ball...@mailo.fr>
CommitDate: Sun Nov 24 16:33:47 2024 +0100
tdf#161930 Copy only once mimetype
mimetype must not be zipped, just stored.
mimetype was correctly stored with the first zip command,
but mimetype was also present in the files list on the second zip command.
This patch remove mimetype from the files list of the second zip command.
Change-Id: Ie66f06103bbad2700eee4986df878b9ebd4c0a09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175930
Tested-by: Jenkins
Reviewed-by: Laurent Balland <laurent.ball...@mailo.fr>
diff --git a/extras/CustomTarget_templates.mk b/extras/CustomTarget_templates.mk
index 9754985f1a59..a0661e96b356 100644
--- a/extras/CustomTarget_templates.mk
+++ b/extras/CustomTarget_templates.mk
@@ -17,7 +17,7 @@ $(call gb_Trace_StartRange,$(subst
$(gb_CustomTarget_workdir)/extras/source/,,$@
cd $(dir $<) && \
$(call gb_Helper_wsl_path,\
$(WSL) zip -q0X --filesync --must-match $@ mimetype && \
-$(WSL) zip -qrX --must-match $@ $(subst $(dir $<),,$^))
+$(WSL) zip -qrX --must-match $@ $(subst $(dir $<),,$^)) -x mimetype
$(call gb_Trace_EndRange,$(subst
$(gb_CustomTarget_workdir)/extras/source/,,$@),ZIP)
endef
