From: Mathew McBride <matt@traverse.com.au>
Date: Wed, 28 Mar 2018 02:34:52 +0000 (+1100)
Subject: build: use busybox gzip compatible force option
X-Git-Tag: v18.06.0-rc1~41
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=97cb9d04eed0715f508f8dae91b56530f163adc3;p=oweals%2Fopenwrt.git

build: use busybox gzip compatible force option

commit 138c763 ("build: add --force option to gzip in Build/gzip")
added the --force flag to the gzip invocation.

Under environments with busybox gzip (e.g Alpine Linux), this fails
as busybox only recognizes "-f".

Signed-off-by: Mathew McBride <matt@traverse.com.au>
(cherry picked from commit fba168f5745acac95db519a9984b62e3e508df6a)
---

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 1d8ccedd69..4d3f025b12 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -135,7 +135,7 @@ define Build/lzma-no-dict
 endef
 
 define Build/gzip
-	gzip --force -9n -c $@ $(1) > $@.new
+	gzip -f -9n -c $@ $(1) > $@.new
 	@mv $@.new $@
 endef