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

libdevmapper: Install dmsetup

Browse Source 
Commit 6aa1dd223a ("lvm2/libdevmapper: fix invoking lvcreate failed")
moved installation of dmsetup back to lvm2 from libdevmapper, but dmsetup
had intentionally been moved to libdevmapper in commit 269d009a81
("lvm2: libdevicemapper package needs udev rules and dmsetup"). Add it back
to libdevmapper by explicitly installing it in do_install(), and refresh
explicitly-do-not-install-libdm.patch so that we also explicitly do not
install dmsetup as part of lvm2.

Signed-off-by: Andrew Bresticker <abrestic@waymo.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andrew Bresticker
2018-09-14 16:57:27 -07:00
committed by Khem Raj
parent dcd9887931
commit ea2ee9c7ac
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/lvm2/libdevmapper_2.02.180.bb
+1
View File
@@ -9,6 +9,7 @@ TARGET_CC_ARCH += "${LDFLAGS}"
do_install() { do_install() {
oe_runmake 'DESTDIR=${D}' -C libdm install oe_runmake 'DESTDIR=${D}' -C libdm install
oe_runmake 'DESTDIR=${D}' -C tools install_device-mapper
} }
RRECOMMENDS_${PN}_append_class-target = " lvm2-udevrules" RRECOMMENDS_${PN}_append_class-target = " lvm2-udevrules"
meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch
+22 -6
View File
@@ -1,4 +1,4 @@
From 0a8e466fcf99622896e070c5133165e4278e8cfb Mon Sep 17 00:00:00 2001 From 5a3e13ae94318c2bed60f875bb3852c45ce0113c Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Thu, 25 May 2017 05:27:11 -0400 Date: Thu, 25 May 2017 05:27:11 -0400
Subject: [PATCH] explicitly do not install libdm Subject: [PATCH] explicitly do not install libdm
@@ -9,12 +9,14 @@ explicitly do not do the installation here.
Upstream-Status: Inappropriate [meta-oe specific] Upstream-Status: Inappropriate [meta-oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Andrew Bresticker <abrestic@waymo.com>
--- ---
libdm/Makefile.in | 6 ++++-- libdm/Makefile.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-) tools/Makefile.in | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/libdm/Makefile.in b/libdm/Makefile.in diff --git a/libdm/Makefile.in b/libdm/Makefile.in
index 3c9a4ce..45c91c6 100644 index 66ec39513..c779c9d86 100644
--- a/libdm/Makefile.in --- a/libdm/Makefile.in
+++ b/libdm/Makefile.in +++ b/libdm/Makefile.in
@@ -77,9 +77,11 @@ ifeq ("@PKGCONFIG@", "yes") @@ -77,9 +77,11 @@ ifeq ("@PKGCONFIG@", "yes")
@@ -23,14 +25,28 @@ index 3c9a4ce..45c91c6 100644
-install: $(INSTALL_TYPE) install_include -install: $(INSTALL_TYPE) install_include
+install: +install:
+ echo "Do not install device mappler in lvm2" + echo "Do not install device mapper in lvm2"
-install_device-mapper: install -install_device-mapper: install
+install_device-mapper: +install_device-mapper:
+ echo "Do not install device mappler in lvm2" + echo "Do not install device mapper in lvm2"
install_include: $(srcdir)/libdevmapper.h install_include: $(srcdir)/libdevmapper.h
$(INSTALL_DATA) -D $< $(includedir)/$(<F) $(INSTALL_DATA) -D $< $(includedir)/$(<F)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 103b76732..63ba7fc04 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -267,7 +267,8 @@ install_dmsetup_static: dmsetup.static
$(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
$(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats
-install_device-mapper: $(INSTALL_DMSETUP_TARGETS)
+install_device-mapper:
+ echo "Do not install device mapper in lvm2"
install_lvm2: $(INSTALL_LVM_TARGETS)
-- --
2.8.1 2.19.0.397.gdd90340f6a-goog