From 882d907f77e21df644ec7c5bc910ea13e915f600 Mon Sep 17 00:00:00 2001 From: "Slater, Joseph" Date: Thu, 29 Nov 2018 12:18:24 -0800 Subject: 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 Signed-off-by: Khem Raj --- .../files/use-sh-on-path.patch | 21 +++++++++++++++++++++ .../thin-provisioning-tools_0.7.6.bb | 1 + 2 files changed, 22 insertions(+) create mode 100644 meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch 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 + +--- 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" -- cgit v1.2.3-54-g00ecf