blob: 24160b405eab3938d953715b9d40943e8b6181b5 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From 3c16d9aaa46602e7594d717d86e7f02066d21134 Mon Sep 17 00:00:00 2001
Brad Bishopd7bf8c12018-02-25 22:55:05 -05002From: Hongxu Jia <hongxu.jia@windriver.com>
Brad Bishop19323692019-04-05 15:28:33 -04003Date: Mon, 26 Nov 2018 17:20:20 +0800
Brad Bishopd7bf8c12018-02-25 22:55:05 -05004Subject: [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 Bishop19323692019-04-05 15:28:33 -040012
13
14Update context for lvm2 2.03.02.
15
16Signed-off-by: Kai Kang <kai.kang@windriver.com>
Brad Bishopd7bf8c12018-02-25 22:55:05 -050017---
Brad Bishop19323692019-04-05 15:28:33 -040018 libdm/Makefile.in | 6 ++++--
19 libdm/dm-tools/Makefile.in | 6 ++++--
20 2 files changed, 8 insertions(+), 4 deletions(-)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050021
22diff --git a/libdm/Makefile.in b/libdm/Makefile.in
Brad Bishop19323692019-04-05 15:28:33 -040023index e9bb5ae..4e9ae3f 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -050024--- a/libdm/Makefile.in
25+++ b/libdm/Makefile.in
Brad Bishop19323692019-04-05 15:28:33 -040026@@ -82,9 +82,11 @@ ifeq ("@PKGCONFIG@", "yes")
Brad Bishopd7bf8c12018-02-25 22:55:05 -050027 INSTALL_TYPE += install_pkgconfig
28 endif
29
30-install: $(INSTALL_TYPE) install_include
31+install:
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_device-mapper: install
35+install_device-mapper:
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080036+ echo "Do not install device mapper in lvm2"
Brad Bishopd7bf8c12018-02-25 22:55:05 -050037
38 install_include: $(srcdir)/libdevmapper.h
Brad Bishop19323692019-04-05 15:28:33 -040039 @echo " [INSTALL] $<"
40diff --git a/libdm/dm-tools/Makefile.in b/libdm/dm-tools/Makefile.in
41index 15a9d8e..65e1306 100644
42--- a/libdm/dm-tools/Makefile.in
43+++ b/libdm/dm-tools/Makefile.in
44@@ -20,7 +20,8 @@ all: device-mapper
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080045
Brad Bishop19323692019-04-05 15:28:33 -040046 SOURCES2 = dmsetup.c
47 TARGETS_DM = dmsetup
48-install_device-mapper: install_dmsetup_dynamic
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080049+install_device-mapper:
50+ echo "Do not install device mapper in lvm2"
51
Brad Bishop19323692019-04-05 15:28:33 -040052 ifeq ("@STATIC_LINK@", "yes")
53 TARGETS_DM += dmsetup.static
54@@ -93,6 +94,7 @@ install_dmfilemapd_static: dmfilemapd.static
55 .PHONY: install_dmsetup_dynamic install_dmsetup_static
56 .PHONY: install_dmfilemapd install_dmfilemapd_static
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080057
Brad Bishop19323692019-04-05 15:28:33 -040058-install: install_device-mapper install_dmfilemapd
59+install:
60+ echo "Do not install device mapper in lvm2"
61
62 device-mapper: $(TARGETS_DM)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050063--
Brad Bishop19323692019-04-05 15:28:33 -0400642.7.4
Brad Bishopd7bf8c12018-02-25 22:55:05 -050065