Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 3c16d9aaa46602e7594d717d86e7f02066d21134 Mon Sep 17 00:00:00 2001 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 3 | Date: Mon, 26 Nov 2018 17:20:20 +0800 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 4 | Subject: [PATCH] explicitly do not install libdm |
| 5 | |
| 6 | Already have package libdevmapper which split from lvm2, |
| 7 | explicitly do not do the installation here. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [meta-oe specific] |
| 10 | |
| 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 12 | |
| 13 | |
| 14 | Update context for lvm2 2.03.02. |
| 15 | |
| 16 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 17 | --- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 18 | libdm/Makefile.in | 6 ++++-- |
| 19 | libdm/dm-tools/Makefile.in | 6 ++++-- |
| 20 | 2 files changed, 8 insertions(+), 4 deletions(-) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 21 | |
| 22 | diff --git a/libdm/Makefile.in b/libdm/Makefile.in |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 23 | index e9bb5ae..4e9ae3f 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 24 | --- a/libdm/Makefile.in |
| 25 | +++ b/libdm/Makefile.in |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 26 | @@ -82,9 +82,11 @@ ifeq ("@PKGCONFIG@", "yes") |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 27 | INSTALL_TYPE += install_pkgconfig |
| 28 | endif |
| 29 | |
| 30 | -install: $(INSTALL_TYPE) install_include |
| 31 | +install: |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 32 | + echo "Do not install device mapper in lvm2" |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 33 | |
| 34 | -install_device-mapper: install |
| 35 | +install_device-mapper: |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 36 | + echo "Do not install device mapper in lvm2" |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 37 | |
| 38 | install_include: $(srcdir)/libdevmapper.h |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 39 | @echo " [INSTALL] $<" |
| 40 | diff --git a/libdm/dm-tools/Makefile.in b/libdm/dm-tools/Makefile.in |
| 41 | index 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 45 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 46 | SOURCES2 = dmsetup.c |
| 47 | TARGETS_DM = dmsetup |
| 48 | -install_device-mapper: install_dmsetup_dynamic |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 49 | +install_device-mapper: |
| 50 | + echo "Do not install device mapper in lvm2" |
| 51 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 52 | 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 57 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 58 | -install: install_device-mapper install_dmfilemapd |
| 59 | +install: |
| 60 | + echo "Do not install device mapper in lvm2" |
| 61 | |
| 62 | device-mapper: $(TARGETS_DM) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 63 | -- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 64 | 2.7.4 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 65 | |