diff options
Diffstat (limited to 'meta-oe/recipes-support/lvm2/lvm2')
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch | 32 | ||||
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2/0001-lvm2-monitoring-service-shouldn-t-refer-to-lvmetad.patch | 31 |
2 files changed, 21 insertions, 42 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 8b805fc1ab..24160b405e 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 @@ -9,16 +9,21 @@ explicitly do not do the installation here. Upstream-Status: Inappropriate [meta-oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + + +Update context for lvm2 2.03.02. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- libdm/Makefile.in | 6 ++++-- libdm/dm-tools/Makefile.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libdm/Makefile.in b/libdm/Makefile.in -index 8c8334a..effcf25 100644 +index e9bb5ae..4e9ae3f 100644 --- a/libdm/Makefile.in +++ b/libdm/Makefile.in -@@ -81,9 +81,11 @@ ifeq ("@PKGCONFIG@", "yes") +@@ -82,9 +82,11 @@ ifeq ("@PKGCONFIG@", "yes") INSTALL_TYPE += install_pkgconfig endif @@ -31,25 +36,30 @@ index 8c8334a..effcf25 100644 + echo "Do not install device mapper in lvm2" install_include: $(srcdir)/libdevmapper.h - $(INSTALL_DATA) -D $< $(includedir)/$(<F) + @echo " [INSTALL] $<" diff --git a/libdm/dm-tools/Makefile.in b/libdm/dm-tools/Makefile.in -index 39d411d..4a0f61a 100644 +index 15a9d8e..65e1306 100644 --- a/libdm/dm-tools/Makefile.in +++ b/libdm/dm-tools/Makefile.in -@@ -60,9 +60,11 @@ install_dmsetup_static: dmsetup.static - $(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) - $(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats +@@ -20,7 +20,8 @@ all: device-mapper --install_device-mapper: $(INSTALL_DMSETUP_TARGETS) + SOURCES2 = dmsetup.c + TARGETS_DM = dmsetup +-install_device-mapper: install_dmsetup_dynamic +install_device-mapper: + echo "Do not install device mapper in lvm2" --install: install_device-mapper + ifeq ("@STATIC_LINK@", "yes") + TARGETS_DM += dmsetup.static +@@ -93,6 +94,7 @@ install_dmfilemapd_static: dmfilemapd.static + .PHONY: install_dmsetup_dynamic install_dmsetup_static + .PHONY: install_dmfilemapd install_dmfilemapd_static + +-install: install_device-mapper install_dmfilemapd +install: + echo "Do not install device mapper in lvm2" - # dmfilemapd support - ifeq ("@BUILD_DMFILEMAPD@", "yes") + device-mapper: $(TARGETS_DM) -- 2.7.4 diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-lvm2-monitoring-service-shouldn-t-refer-to-lvmetad.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-lvm2-monitoring-service-shouldn-t-refer-to-lvmetad.patch deleted file mode 100644 index 4eeac1c575..0000000000 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-lvm2-monitoring-service-shouldn-t-refer-to-lvmetad.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b922f4a4e7e1c6c64a235bae4c575540bc4a12df Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Thu, 21 Feb 2019 14:00:34 +0800 -Subject: [PATCH] lvm2-monitoring service shouldn't refer to lvmetad - -Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git; -a=commit;h=df2fa88e631b13f0f2cfff4aeab80f12bd93ab72] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - scripts/lvm2_monitoring_systemd_red_hat.service.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in -index 2b87479..3282a95 100644 ---- a/scripts/lvm2_monitoring_systemd_red_hat.service.in -+++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in -@@ -1,8 +1,8 @@ - [Unit] - Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling - Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8) --Requires=dm-event.socket lvm2-lvmetad.socket --After=dm-event.socket dm-event.service lvm2-lvmetad.socket lvm2-activation.service lvm2-lvmetad.service tmp.mount -+Requires=dm-event.socket -+After=dm-event.socket dm-event.service lvm2-activation.service tmp.mount - Before=local-fs-pre.target - DefaultDependencies=no - Conflicts=shutdown.target --- -2.7.4 - |