diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files')
2 files changed, 34 insertions, 42 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-fix-compile-failed-with-libc-musl.patch b/external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-fix-compile-failed-with-libc-musl.patch deleted file mode 100644 index 28b44da5..00000000 --- a/external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-fix-compile-failed-with-libc-musl.patch +++ /dev/null @@ -1,42 +0,0 @@ -From fcbcf9c494cca166106ae4cb03c1dd135ee4f25c Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 1 Aug 2018 09:34:00 +0800 -Subject: [PATCH] fix compile failed with libc musl - -There is a failure while compiling with libc musl: -[snip] -|./block-cache/io_engine.h:18:17: error: expected -unqualified-id before numeric constant -| unsigned const PAGE_SIZE = 4096; -[snip] - -The musl defeines macro PAGE_SIZE, undef it conditionally -could fix the issue. - -http://musl.openwall.narkive.com/tO8vrHdP/why-musl-define-page-size - -Upstream-Status: Submitted [git://github.com/jthornber/thin-provisioning-tools] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - block-cache/io_engine.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/block-cache/io_engine.h b/block-cache/io_engine.h -index 1704251..e36b932 100644 ---- a/block-cache/io_engine.h -+++ b/block-cache/io_engine.h -@@ -12,6 +12,10 @@ - - //---------------------------------------------------------------- - -+// Musl defines -+#ifdef PAGE_SIZE -+#undef PAGE_SIZE -+#endif - namespace bcache { - using sector_t = uint64_t; - --- -2.7.4 - diff --git a/external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch b/external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch new file mode 100644 index 00000000..de934c19 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch @@ -0,0 +1,34 @@ +From 38397b42e2c3450c2aee20e6fb92f362db4e35ef Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Tue, 2 Jul 2019 13:20:39 +0800 +Subject: [PATCH] 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> + +Rebase to 0.8.5 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 7c867b2..5303994 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -223,7 +223,7 @@ endif + %.8: %.txt bin/txt2man + @echo " [txt2man] $<" + @mkdir -p $(dir $@) +- $(V) bin/txt2man -p -t $(basename $(notdir $<)) $< > $@ ++ $(V) sh bin/txt2man -p -t $(basename $(notdir $<)) $< > $@ + + #---------------------------------------------------------------- + +-- +2.7.4 + |