aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-extended/gzip
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-29 12:46:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-29 12:46:03 +0000
commita764a648b1f010c1faedb3ef361a1daa74a69d44 (patch)
tree5653b8b203446b9489381b0335284ef848080886 /recipes-extended/gzip
parent6107be140fdec204586850ea1f7e4b968be7670b (diff)
downloadmeta-gplv2-a764a648b1f010c1faedb3ef361a1daa74a69d44.tar.gz
meta-gplv2-a764a648b1f010c1faedb3ef361a1daa74a69d44.tar.bz2
meta-gplv2-a764a648b1f010c1faedb3ef361a1daa74a69d44.zip
gzip: Fix failure from recent shell changes
We want the shell preserved as /bin/sh, tweak the makefile to achieve this. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'recipes-extended/gzip')
-rw-r--r--recipes-extended/gzip/gzip-1.3.12/fix-shell.patch16
-rw-r--r--recipes-extended/gzip/gzip_1.3.12.bb1
2 files changed, 17 insertions, 0 deletions
diff --git a/recipes-extended/gzip/gzip-1.3.12/fix-shell.patch b/recipes-extended/gzip/gzip-1.3.12/fix-shell.patch
new file mode 100644
index 0000000..13b479b
--- /dev/null
+++ b/recipes-extended/gzip/gzip-1.3.12/fix-shell.patch
@@ -0,0 +1,16 @@
+We want /bin/sh left as the shell, not bash for example
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+Upstream-Status: Inappropriate [fixed differently in new versions]
+
+Index: gzip-1.3.12/Makefile.am
+===================================================================
+--- gzip-1.3.12.orig/Makefile.am
++++ gzip-1.3.12/Makefile.am
+@@ -55,7 +55,6 @@ gzip.doc.gz: gzip.doc
+ SUFFIXES = .in
+ .in:
+ sed \
+- -e 's|/bin/sh|$(SHELL)|g' \
+ -e 's|BINDIR|$${GZIP_BINDIR-'\''$(bindir)'\''}|g' \
+ -e 's|[@]VERSION@|$(VERSION)|g' \
+ $(srcdir)/$@.in >$@
diff --git a/recipes-extended/gzip/gzip_1.3.12.bb b/recipes-extended/gzip/gzip_1.3.12.bb
index e406282..5f7f6cd 100644
--- a/recipes-extended/gzip/gzip_1.3.12.bb
+++ b/recipes-extended/gzip/gzip_1.3.12.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz \
file://m4-extensions-fix.patch \
+ file://fix-shell.patch \
file://dup-def-fix.patch"
SRC_URI[md5sum] = "b5bac2d21840ae077e0217bc5e4845b1"