aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorSlater, Joseph <joe.slater@windriver.com>2018-11-29 12:18:24 -0800
committerKhem Raj <raj.khem@gmail.com>2018-11-29 18:55:52 -0800
commit882d907f77e21df644ec7c5bc910ea13e915f600 (patch)
tree8d95ed972e3ea8e62f98837c9e3eeda6b48fcf9d /meta-oe
parent7fd1474beeda31a6b14cd25c5519bf33a34506ce (diff)
downloadmeta-openembedded-882d907f77e21df644ec7c5bc910ea13e915f600.tar.gz
meta-openembedded-882d907f77e21df644ec7c5bc910ea13e915f600.tar.bz2
meta-openembedded-882d907f77e21df644ec7c5bc910ea13e915f600.zip
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.patch21
-rw-r--r--meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.7.6.bb1
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 @@
+
+thin-provisioning-tools: use sh on path when invoking txt2man
+
+txt2man contains a test which might try to use ksh to run the script, so we
+avoid running /bin/sh.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: joe.slater <joe.slater@windriver.com>
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -210,7 +210,7 @@ endif
+
+ %.8: %.txt bin/txt2man
+ @echo " [txt2man] $<"
+- $(V) bin/txt2man -p -t $(basename $(notdir $<)) $< > $@
++ $(V) sh bin/txt2man -p -t $(basename $(notdir $<)) $< > $@
+
+ #----------------------------------------------------------------
+
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"
SRC_URI = "git://github.com/jthornber/thin-provisioning-tools \
file://0001-do-not-strip-pdata_tools-at-do_install.patch \
file://0001-fix-compile-failed-with-libc-musl.patch \
+ file://use-sh-on-path.patch \
"
SRCREV = "6f936992b8e6208a7838fcf1ec87c5bd3a694a77"