diff options
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2/0001-lvm2-monitoring-service-shouldn-t-refer-to-lvmetad.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2_2.03.01.bb | 4 |
2 files changed, 34 insertions, 1 deletions
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 new file mode 100644 index 0000000000..4eeac1c575 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/lvm2/0001-lvm2-monitoring-service-shouldn-t-refer-to-lvmetad.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From b922f4a4e7e1c6c64a235bae4c575540bc4a12df Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Thu, 21 Feb 2019 14:00:34 +0800 | ||
4 | Subject: [PATCH] lvm2-monitoring service shouldn't refer to lvmetad | ||
5 | |||
6 | Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git; | ||
7 | a=commit;h=df2fa88e631b13f0f2cfff4aeab80f12bd93ab72] | ||
8 | |||
9 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
10 | --- | ||
11 | scripts/lvm2_monitoring_systemd_red_hat.service.in | 4 ++-- | ||
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in | ||
15 | index 2b87479..3282a95 100644 | ||
16 | --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in | ||
17 | +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in | ||
18 | @@ -1,8 +1,8 @@ | ||
19 | [Unit] | ||
20 | Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling | ||
21 | Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8) | ||
22 | -Requires=dm-event.socket lvm2-lvmetad.socket | ||
23 | -After=dm-event.socket dm-event.service lvm2-lvmetad.socket lvm2-activation.service lvm2-lvmetad.service tmp.mount | ||
24 | +Requires=dm-event.socket | ||
25 | +After=dm-event.socket dm-event.service lvm2-activation.service tmp.mount | ||
26 | Before=local-fs-pre.target | ||
27 | DefaultDependencies=no | ||
28 | Conflicts=shutdown.target | ||
29 | -- | ||
30 | 2.7.4 | ||
31 | |||
diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.01.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.01.bb index b28acf1c4b..c38c381915 100644 --- a/meta-oe/recipes-support/lvm2/lvm2_2.03.01.bb +++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.01.bb | |||
@@ -2,7 +2,9 @@ require lvm2.inc | |||
2 | 2 | ||
3 | SRCREV = "913c28917e62577a2ef67152b2e5159237503dda" | 3 | SRCREV = "913c28917e62577a2ef67152b2e5159237503dda" |
4 | 4 | ||
5 | SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch" | 5 | SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch \ |
6 | file://0001-lvm2-monitoring-service-shouldn-t-refer-to-lvmetad.patch \ | ||
7 | " | ||
6 | 8 | ||
7 | DEPENDS += "autoconf-archive-native" | 9 | DEPENDS += "autoconf-archive-native" |
8 | 10 | ||