Skip to contentSkip to conversation

fix invoking lvm2 with modprob not found and add thin-provisioning-tools 0.6.3

PATCH New Hongxu Jia 1 participant 3 messages Aug 31, 2016

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

v3 cover fix invoking lvm2 with modprob not found and add thin-provisioning-tools 0.6.3

Changed in V2 & V3:

As Martin suggested:
- Fix too long SUMMARY.
- Closing quote should be first character (without indentation).
- Use autotools-brokensep to replace autotools

//Hongxu

The following changes since commit dc48e768f527cbed0cc3899f6a2ebb396cd9ada8:

meta-oe: remove trailing spaces (2016-08-22 15:56:29 +0200)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib hongxu/lvm2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=hongxu/lvm2

Hongxu Jia (2):
lvm2: tweak MODPROBE_CMD for cross compile
thin-provisioning-tools: add version 0.6.3

 meta-oe/recipes-support/lvm2/lvm2.inc              |  5 ++-
 ...0005-tweak-MODPROBE_CMD-for-cross-compile.patch | 38 ++++++++++++++++++++++
 ...01-do-not-strip-pdata_tools-at-do_install.patch | 33 +++++++++++++++++++
 .../thin-provisioning-tools_0.6.3.bb               | 18 ++++++++++
 4 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/lvm2/lvm2/0005-tweak-MODPROBE_CMD-for-cross-compile.patch
 create mode 100644 meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch
 create mode 100755 meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.6.3.bb
Signature · 1 line
2.8.1
author
#1 lore raw

PATCH v3 1/2 lvm2: tweak MODPROBE_CMD for cross compile

Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe
is incorrect.
------
|lvm lvcreate --thinpool wrl/pool00 --size 5556m --config devices
{ preferred_names=["^/dev/mapper/", "^/dev/md/", "^/dev/sd"] filter=["r|/loop1$|","r|/loop2$|","r|/loop3$|","r|/loop4$|","r|/loop5$|","r|/loop6$|","r|/loop7$|"] } |tmp/sysroots/x86_64-linux/usr/bin/modprobe: execvp failed: No such file or directory |tmp/sysroots/x86_64-linux/usr/bin/modprobe failed: 2
------

---
 meta-oe/recipes-support/lvm2/lvm2.inc              |  3 ++
 ...0005-tweak-MODPROBE_CMD-for-cross-compile.patch | 38 ++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 meta-oe/recipes-support/lvm2/lvm2/0005-tweak-MODPROBE_CMD-for-cross-compile.patch
meta-oe/recipes-support/lvm2/lvm2.inc +3 -0
index 3a5e1c4..e452f11 100644
@@ -11,6 +11,7 @@ SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \
            file://0002-use-PTHREAD_MUTEX_RECURSIVE-instead-of-PTHREAD_MUTEX.patch \
            file://0003-Guard-use-of-mallinfo-with-__GLIBC__.patch \
            file://0004-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \
+           file://0005-tweak-MODPROBE_CMD-for-cross-compile.patch \
            "
 
 S = "${WORKDIR}/LVM2.${PV}"
@@ -39,6 +40,8 @@ EXTRA_OECONF = "--with-user= \
                 --with-systemdsystemunitdir=${systemd_system_unitdir} \
 "
 
+CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe"
+
 do_install_append() {
     # Install machine specific configuration file
     install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf
meta-oe/recipes-support/lvm2/lvm2/0005-tweak-MODPROBE_CMD-for-cross-compile.patch new file +38 -0
new file mode 100644
index 0000000..8db320d
@@ -0,0 +1,38 @@
+From 72866782f83c8cf85b10017df461128af90cae6e Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Tue, 30 Aug 2016 22:33:47 -0400
+Subject: [PATCH] tweak MODPROBE_CMD for cross compile
+
+Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe
+is incorrect.
+------
+|lvm lvcreate --thinpool wrl/pool00 --size 5556m --config  devices
+{ preferred_names=["^/dev/mapper/", "^/dev/md/", "^/dev/sd"]
+filter=["r|/loop1$|","r|/loop2$|","r|/loop3$|","r|/loop4$|","r|/loop5$|","r|/loop6$|","r|/loop7$|"] }
+|tmp/sysroots/x86_64-linux/usr/bin/modprobe: execvp failed: No such file or directory
+|tmp/sysroots/x86_64-linux/usr/bin/modprobe failed: 2
+------
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ configure.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 8e04782..77681b0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1779,8 +1779,6 @@ if test "$UDEV_SYNC" = yes; then
+ fi
+ 
+ ################################################################################
+-AC_PATH_TOOL(MODPROBE_CMD, modprobe)
+-
+ if test -n "$MODPROBE_CMD"; then
+ 	AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.])
+ fi
+-- 
+2.8.1
+
Signature · 1 line
2.8.1
author
#2 lore raw

PATCH v3 2/2 thin-provisioning-tools: add version 0.6.3

In reply to Hongxu Jia

It is required by lvm2, since lvm2 could find modprobe correctly
------
|lvm lvchange -a y --config devices { preferred_names=["^/dev/mapper/", "^/dev/md/", "^/dev/sd"] } wrl/pool00 |/usr/sbin/thin_check: execvp failed: No such file or directory | Check of pool wrl/pool00 failed (status:2). Manual repair required!
------

The thin-provisioning-tools provides /usr/sbin/thin_check.

---
 meta-oe/recipes-support/lvm2/lvm2.inc              |  2 +-
 ...01-do-not-strip-pdata_tools-at-do_install.patch | 33 ++++++++++++++++++++++
 .../thin-provisioning-tools_0.6.3.bb               | 18 ++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch
 create mode 100755 meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.6.3.bb
meta-oe/recipes-support/lvm2/lvm2.inc +1 -1
index e452f11..e2feeb3 100644
@@ -66,6 +66,6 @@ TARGET_CC_ARCH += "${LDFLAGS}"
 FILES_${PN} += "${libdir}/device-mapper/*.so ${base_libdir}/udev"
 FILES_${PN}-dbg += "${libdir}/device-mapper/.debug"
 
-RDEPENDS_${PN} = "bash"
+RDEPENDS_${PN} = "bash thin-provisioning-tools"
 
 CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf"
meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch new file +33 -0
new file mode 100644
index 0000000..b4cdda1
@@ -0,0 +1,33 @@
+From e8be402e20cbdfbd8192a171ac9904d9362103bf Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Wed, 31 Aug 2016 01:35:40 -0400
+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 <[email protected]>
+---
+ Makefile.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 4264191..ac22042 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -189,7 +189,6 @@ distclean: clean
+ install: bin/pdata_tools
+ 	$(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.8.1
+
meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.6.3.bb new file +18 -0
new file mode 100755
index 0000000..c9d6690
@@ -0,0 +1,18 @@
+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 \
+"
+
+SRCREV = "49bfc12e9c7956c1ac134b24afbe1a6a602ce7d5"
+
+DEPENDS += "expat libaio boost"
+
+inherit autotools-brokensep
Signature · 1 line
2.8.1