diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-29 12:46:00 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-29 12:46:03 +0000 |
commit | a764a648b1f010c1faedb3ef361a1daa74a69d44 (patch) | |
tree | 5653b8b203446b9489381b0335284ef848080886 /recipes-extended | |
parent | 6107be140fdec204586850ea1f7e4b968be7670b (diff) | |
download | meta-gplv2-a764a648b1f010c1faedb3ef361a1daa74a69d44.tar.gz |
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')
-rw-r--r-- | recipes-extended/gzip/gzip-1.3.12/fix-shell.patch | 16 | ||||
-rw-r--r-- | recipes-extended/gzip/gzip_1.3.12.bb | 1 |
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 @@ | |||
1 | We want /bin/sh left as the shell, not bash for example | ||
2 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Upstream-Status: Inappropriate [fixed differently in new versions] | ||
4 | |||
5 | Index: gzip-1.3.12/Makefile.am | ||
6 | =================================================================== | ||
7 | --- gzip-1.3.12.orig/Makefile.am | ||
8 | +++ gzip-1.3.12/Makefile.am | ||
9 | @@ -55,7 +55,6 @@ gzip.doc.gz: gzip.doc | ||
10 | SUFFIXES = .in | ||
11 | .in: | ||
12 | sed \ | ||
13 | - -e 's|/bin/sh|$(SHELL)|g' \ | ||
14 | -e 's|BINDIR|$${GZIP_BINDIR-'\''$(bindir)'\''}|g' \ | ||
15 | -e 's|[@]VERSION@|$(VERSION)|g' \ | ||
16 | $(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 \ | |||
7 | 7 | ||
8 | SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz \ | 8 | SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz \ |
9 | file://m4-extensions-fix.patch \ | 9 | file://m4-extensions-fix.patch \ |
10 | file://fix-shell.patch \ | ||
10 | file://dup-def-fix.patch" | 11 | file://dup-def-fix.patch" |
11 | 12 | ||
12 | SRC_URI[md5sum] = "b5bac2d21840ae077e0217bc5e4845b1" | 13 | SRC_URI[md5sum] = "b5bac2d21840ae077e0217bc5e4845b1" |