diff options
author | Slater, Joseph <joe.slater@windriver.com> | 2018-11-29 12:18:24 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-11-29 18:55:52 -0800 |
commit | 882d907f77e21df644ec7c5bc910ea13e915f600 (patch) | |
tree | 8d95ed972e3ea8e62f98837c9e3eeda6b48fcf9d /meta-oe | |
parent | 7fd1474beeda31a6b14cd25c5519bf33a34506ce (diff) | |
download | meta-openembedded-882d907f77e21df644ec7c5bc910ea13e915f600.tar.gz |
thin-provisioning tools: use sh on path for txt2man
txt2man will use /bin/sh and may try to invoke ksh if it
does not like /bin/sh. Use "our" version of sh.
Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch | 21 | ||||
-rw-r--r-- | meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.7.6.bb | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch b/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch new file mode 100644 index 000000000..8cb16decb --- /dev/null +++ b/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | |||
2 | thin-provisioning-tools: use sh on path when invoking txt2man | ||
3 | |||
4 | txt2man contains a test which might try to use ksh to run the script, so we | ||
5 | avoid running /bin/sh. | ||
6 | |||
7 | Upstream-Status: Inappropriate [oe specific] | ||
8 | |||
9 | Signed-off-by: joe.slater <joe.slater@windriver.com> | ||
10 | |||
11 | --- a/Makefile.in | ||
12 | +++ b/Makefile.in | ||
13 | @@ -210,7 +210,7 @@ endif | ||
14 | |||
15 | %.8: %.txt bin/txt2man | ||
16 | @echo " [txt2man] $<" | ||
17 | - $(V) bin/txt2man -p -t $(basename $(notdir $<)) $< > $@ | ||
18 | + $(V) sh bin/txt2man -p -t $(basename $(notdir $<)) $< > $@ | ||
19 | |||
20 | #---------------------------------------------------------------- | ||
21 | |||
diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.7.6.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.7.6.bb index 20cb17aa2..5f6ba9e37 100644 --- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.7.6.bb +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.7.6.bb | |||
@@ -10,6 +10,7 @@ S = "${WORKDIR}/git" | |||
10 | SRC_URI = "git://github.com/jthornber/thin-provisioning-tools \ | 10 | SRC_URI = "git://github.com/jthornber/thin-provisioning-tools \ |
11 | file://0001-do-not-strip-pdata_tools-at-do_install.patch \ | 11 | file://0001-do-not-strip-pdata_tools-at-do_install.patch \ |
12 | file://0001-fix-compile-failed-with-libc-musl.patch \ | 12 | file://0001-fix-compile-failed-with-libc-musl.patch \ |
13 | file://use-sh-on-path.patch \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | SRCREV = "6f936992b8e6208a7838fcf1ec87c5bd3a694a77" | 16 | SRCREV = "6f936992b8e6208a7838fcf1ec87c5bd3a694a77" |