mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 17:19:23 +00:00
Code Issues Projects Releases Wiki Activity

thin-provisioning-tools: 0.6.3 -> 0.7.6

Browse Source 
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia
2018-08-01 15:21:30 +08:00
committed by Khem Raj
parent 3bea987cde
commit 0d4aa6076c
3 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch
+6 -6
View File
@@ -1,6 +1,6 @@
From e8be402e20cbdfbd8192a171ac9904d9362103bf Mon Sep 17 00:00:00 2001
From de869ad2cb19d81257a159770ebe27593a71593c Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Wed, 31 Aug 2016 01:35:40 -0400
Date: Tue, 31 Jul 2018 11:29:51 +0800
Subject: [PATCH] do not strip pdata_tools at do_install
It caused QA Issue:
@@ -17,11 +17,11 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index 4264191..ac22042 100644
index 02b75dd..df590b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -189,7 +189,6 @@ distclean: clean
install: bin/pdata_tools
@@ -267,7 +267,6 @@ MANPAGES:=$(patsubst %,man8/%.8,$(TOOLS))
install: bin/pdata_tools $(MANPAGES)
$(INSTALL_DIR) $(BINDIR)
$(INSTALL_PROGRAM) bin/pdata_tools $(BINDIR)
- $(STRIP) $(BINDIR)/pdata_tools
@@ -29,5 +29,5 @@ index 4264191..ac22042 100644
ln -s -f pdata_tools $(BINDIR)/cache_dump
ln -s -f pdata_tools $(BINDIR)/cache_metadata_size
--
2.8.1
2.7.4
meta-oe/recipes-support/thin-provisioning-tools/files/0001-fix-compile-failed-with-libc-musl.patch
+42
View File
@@ -0,0 +1,42 @@
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
meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.6.3.bb → meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.7.6.bb
+2 -1
View File
@@ -9,9 +9,10 @@ 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 \
"
SRCREV = "49bfc12e9c7956c1ac134b24afbe1a6a602ce7d5"
SRCREV = "6f936992b8e6208a7838fcf1ec87c5bd3a694a77"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"