summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-11-27 16:32:44 +0800
committerKhem Raj <raj.khem@gmail.com>2018-11-27 11:13:37 -0800
commita7bc7b6853acbb0b85be2d60fb1046bc481edf5c (patch)
tree35ffa468565fa5a3d8c13e8735eabc14a64a63e6 /meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch
parent59ea4a873dfbab38b53a74d429f8dd1c6da2cc1f (diff)
downloadmeta-openembedded-a7bc7b6853acbb0b85be2d60fb1046bc481edf5c.tar.gz
lvm2/libdevmapper: 2.02.180 -> 2.03.01
- Upddate upstream SRC_URI, use github to replace tarball - Rebase 0001-Avoid-bashisms-in-init-scripts.patch, 0005-do-not-build-manual.patch, 0001-explicitly-do-not-install-libdm.patch - Remove `--enable-applib' since upstream [0d22b58 liblvm: remove lvmapi] - Remove `lvmetad' since upstream [117160b Remove lvmetad] - Remove `oe_runmake ... -C tools install_device-mapper' since upstream [0524829 dmsetup: move to libdm/dm-tools/dmsetup] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch')
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch33
1 files changed, 18 insertions, 15 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch
index 7f5dd9334..8b805fc1a 100644
--- a/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch
+++ b/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch
@@ -1,6 +1,6 @@
1From 5a3e13ae94318c2bed60f875bb3852c45ce0113c Mon Sep 17 00:00:00 2001 1From 3c16d9aaa46602e7594d717d86e7f02066d21134 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 25 May 2017 05:27:11 -0400 3Date: Mon, 26 Nov 2018 17:20:20 +0800
4Subject: [PATCH] explicitly do not install libdm 4Subject: [PATCH] explicitly do not install libdm
5 5
6Already have package libdevmapper which split from lvm2, 6Already have package libdevmapper which split from lvm2,
@@ -9,17 +9,16 @@ explicitly do not do the installation here.
9Upstream-Status: Inappropriate [meta-oe specific] 9Upstream-Status: Inappropriate [meta-oe specific]
10 10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12Signed-off-by: Andrew Bresticker <abrestic@waymo.com>
13--- 12---
14 libdm/Makefile.in | 6 ++++-- 13 libdm/Makefile.in | 6 ++++--
15 tools/Makefile.in | 3 ++- 14 libdm/dm-tools/Makefile.in | 6 ++++--
16 2 files changed, 6 insertions(+), 3 deletions(-) 15 2 files changed, 8 insertions(+), 4 deletions(-)
17 16
18diff --git a/libdm/Makefile.in b/libdm/Makefile.in 17diff --git a/libdm/Makefile.in b/libdm/Makefile.in
19index 66ec39513..c779c9d86 100644 18index 8c8334a..effcf25 100644
20--- a/libdm/Makefile.in 19--- a/libdm/Makefile.in
21+++ b/libdm/Makefile.in 20+++ b/libdm/Makefile.in
22@@ -77,9 +77,11 @@ ifeq ("@PKGCONFIG@", "yes") 21@@ -81,9 +81,11 @@ ifeq ("@PKGCONFIG@", "yes")
23 INSTALL_TYPE += install_pkgconfig 22 INSTALL_TYPE += install_pkgconfig
24 endif 23 endif
25 24
@@ -33,11 +32,11 @@ index 66ec39513..c779c9d86 100644
33 32
34 install_include: $(srcdir)/libdevmapper.h 33 install_include: $(srcdir)/libdevmapper.h
35 $(INSTALL_DATA) -D $< $(includedir)/$(<F) 34 $(INSTALL_DATA) -D $< $(includedir)/$(<F)
36diff --git a/tools/Makefile.in b/tools/Makefile.in 35diff --git a/libdm/dm-tools/Makefile.in b/libdm/dm-tools/Makefile.in
37index 103b76732..63ba7fc04 100644 36index 39d411d..4a0f61a 100644
38--- a/tools/Makefile.in 37--- a/libdm/dm-tools/Makefile.in
39+++ b/tools/Makefile.in 38+++ b/libdm/dm-tools/Makefile.in
40@@ -267,7 +267,8 @@ install_dmsetup_static: dmsetup.static 39@@ -60,9 +60,11 @@ install_dmsetup_static: dmsetup.static
41 $(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) 40 $(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
42 $(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats 41 $(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats
43 42
@@ -45,8 +44,12 @@ index 103b76732..63ba7fc04 100644
45+install_device-mapper: 44+install_device-mapper:
46+ echo "Do not install device mapper in lvm2" 45+ echo "Do not install device mapper in lvm2"
47 46
48 install_lvm2: $(INSTALL_LVM_TARGETS) 47-install: install_device-mapper
48+install:
49+ echo "Do not install device mapper in lvm2"
49 50
51 # dmfilemapd support
52 ifeq ("@BUILD_DMFILEMAPD@", "yes")
50-- 53--
512.19.0.397.gdd90340f6a-goog 542.7.4
52 55