blob: 7f5dd933414beb14ec23a024299b9188f22c993b [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 5a3e13ae94318c2bed60f875bb3852c45ce0113c Mon Sep 17 00:00:00 2001
Brad Bishopd7bf8c12018-02-25 22:55:05 -05002From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 25 May 2017 05:27:11 -0400
4Subject: [PATCH] explicitly do not install libdm
5
6Already have package libdevmapper which split from lvm2,
7explicitly do not do the installation here.
8
9Upstream-Status: Inappropriate [meta-oe specific]
10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080012Signed-off-by: Andrew Bresticker <abrestic@waymo.com>
Brad Bishopd7bf8c12018-02-25 22:55:05 -050013---
14 libdm/Makefile.in | 6 ++++--
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080015 tools/Makefile.in | 3 ++-
16 2 files changed, 6 insertions(+), 3 deletions(-)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050017
18diff --git a/libdm/Makefile.in b/libdm/Makefile.in
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080019index 66ec39513..c779c9d86 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -050020--- a/libdm/Makefile.in
21+++ b/libdm/Makefile.in
22@@ -77,9 +77,11 @@ ifeq ("@PKGCONFIG@", "yes")
23 INSTALL_TYPE += install_pkgconfig
24 endif
25
26-install: $(INSTALL_TYPE) install_include
27+install:
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080028+ echo "Do not install device mapper in lvm2"
Brad Bishopd7bf8c12018-02-25 22:55:05 -050029
30-install_device-mapper: install
31+install_device-mapper:
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080032+ echo "Do not install device mapper in lvm2"
Brad Bishopd7bf8c12018-02-25 22:55:05 -050033
34 install_include: $(srcdir)/libdevmapper.h
35 $(INSTALL_DATA) -D $< $(includedir)/$(<F)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080036diff --git a/tools/Makefile.in b/tools/Makefile.in
37index 103b76732..63ba7fc04 100644
38--- a/tools/Makefile.in
39+++ b/tools/Makefile.in
40@@ -267,7 +267,8 @@ install_dmsetup_static: dmsetup.static
41 $(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
42 $(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats
43
44-install_device-mapper: $(INSTALL_DMSETUP_TARGETS)
45+install_device-mapper:
46+ echo "Do not install device mapper in lvm2"
47
48 install_lvm2: $(INSTALL_LVM_TARGETS)
49
Brad Bishopd7bf8c12018-02-25 22:55:05 -050050--
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800512.19.0.397.gdd90340f6a-goog
Brad Bishopd7bf8c12018-02-25 22:55:05 -050052