From 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd Mon Sep 17 00:00:00 2001 From: ToshikazuOhiwa Date: Mon, 30 Mar 2020 09:24:26 +0900 Subject: agl-basesystem --- ...01-do-not-strip-pdata_tools-at-do_install.patch | 33 +++++++++++++++++ .../0001-fix-compile-failed-with-libc-musl.patch | 42 ++++++++++++++++++++++ .../thin-provisioning-tools_0.7.6.bb | 21 +++++++++++ 3 files changed, 96 insertions(+) create mode 100644 external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch create mode 100644 external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-fix-compile-failed-with-libc-musl.patch create mode 100644 external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.7.6.bb (limited to 'external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools') diff --git a/external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch b/external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch new file mode 100644 index 00000000..547949dd --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch @@ -0,0 +1,33 @@ +From de869ad2cb19d81257a159770ebe27593a71593c Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Tue, 31 Jul 2018 11:29:51 +0800 +Subject: [PATCH] do not strip pdata_tools at do_install + +It caused QA Issue: +-------------- +|ERROR: QA Issue: File '/usr/sbin/pdata_tools' from thin-provisioning-tools +was already stripped, this will prevent future debugging! [already-stripped] +-------------- + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + Makefile.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 02b75dd..df590b4 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -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 + ln -s -f pdata_tools $(BINDIR)/cache_check + ln -s -f pdata_tools $(BINDIR)/cache_dump + ln -s -f pdata_tools $(BINDIR)/cache_metadata_size +-- +2.7.4 + 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 new file mode 100644 index 00000000..28b44da5 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-fix-compile-failed-with-libc-musl.patch @@ -0,0 +1,42 @@ +From fcbcf9c494cca166106ae4cb03c1dd135ee4f25c Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +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 +--- + 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/thin-provisioning-tools_0.7.6.bb b/external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.7.6.bb new file mode 100644 index 00000000..20cb17aa --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.7.6.bb @@ -0,0 +1,21 @@ +SUMMARY = "Tools of dm-thin device-mapper" +DESCRIPTION = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target." +HOMEPAGE = "https://github.com/jthornber/thin-provisioning-tools" +LICENSE = "GPLv3" +SECTION = "devel" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +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 = "6f936992b8e6208a7838fcf1ec87c5bd3a694a77" + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + +DEPENDS += "expat libaio boost" + +inherit autotools-brokensep -- cgit 1.2.3-korg