Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 5a3e13ae94318c2bed60f875bb3852c45ce0113c 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> |
| 3 | Date: Thu, 25 May 2017 05:27:11 -0400 |
| 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 | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 12 | Signed-off-by: Andrew Bresticker <abrestic@waymo.com> |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 13 | --- |
| 14 | libdm/Makefile.in | 6 ++++-- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 15 | tools/Makefile.in | 3 ++- |
| 16 | 2 files changed, 6 insertions(+), 3 deletions(-) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 17 | |
| 18 | diff --git a/libdm/Makefile.in b/libdm/Makefile.in |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 19 | index 66ec39513..c779c9d86 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 20 | --- 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 28 | + echo "Do not install device mapper in lvm2" |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 29 | |
| 30 | -install_device-mapper: install |
| 31 | +install_device-mapper: |
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_include: $(srcdir)/libdevmapper.h |
| 35 | $(INSTALL_DATA) -D $< $(includedir)/$(<F) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 36 | diff --git a/tools/Makefile.in b/tools/Makefile.in |
| 37 | index 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 Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 50 | -- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 51 | 2.19.0.397.gdd90340f6a-goog |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 52 | |