diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-11-27 16:32:44 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-11-27 11:13:37 -0800 |
commit | a7bc7b6853acbb0b85be2d60fb1046bc481edf5c (patch) | |
tree | 35ffa468565fa5a3d8c13e8735eabc14a64a63e6 /meta-oe | |
parent | 59ea4a873dfbab38b53a74d429f8dd1c6da2cc1f (diff) | |
download | meta-openembedded-a7bc7b6853acbb0b85be2d60fb1046bc481edf5c.tar.gz |
lvm2/libdevmapper: 2.02.180 -> 2.03.01
- Upddate upstream SRC_URI, use github to replace tarball
- Rebase 0001-Avoid-bashisms-in-init-scripts.patch,
0005-do-not-build-manual.patch,
0001-explicitly-do-not-install-libdm.patch
- Remove `--enable-applib' since upstream [0d22b58 liblvm: remove lvmapi]
- Remove `lvmetad' since upstream [117160b Remove lvmetad]
- Remove `oe_runmake ... -C tools install_device-mapper' since upstream
[0524829 dmsetup: move to libdm/dm-tools/dmsetup]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch | 136 | ||||
-rw-r--r-- | meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-support/lvm2/libdevmapper_2.03.01.bb (renamed from meta-oe/recipes-support/lvm2/libdevmapper_2.02.180.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2.inc | 8 | ||||
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch | 33 | ||||
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2_2.03.01.bb (renamed from meta-oe/recipes-support/lvm2/lvm2_2.02.180.bb) | 4 |
6 files changed, 75 insertions, 140 deletions
diff --git a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch index 5b55111dc..3c4a3a151 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch | |||
@@ -1,26 +1,27 @@ | |||
1 | From 916ea0c70fd063ab7b81f16fd917a75dc02edf4f Mon Sep 17 00:00:00 2001 | 1 | From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001 |
2 | From: Peter Kjellerstedt <pkj@axis.com> | 2 | From: Peter Kjellerstedt <peter.kjellerstedt@axis.com> |
3 | Date: Fri, 17 Mar 2017 03:18:28 +0100 | 3 | Date: Mon, 26 Nov 2018 14:53:09 +0800 |
4 | Subject: [PATCH] Avoid bashisms in init scripts | 4 | Subject: [PATCH 1/3] Avoid bashisms in init scripts |
5 | 5 | ||
6 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
7 | 7 | ||
8 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 8 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> |
9 | |||
10 | Rebase to 2.03.01 | ||
11 | |||
12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
9 | --- | 13 | --- |
10 | scripts/blk_availability_init_red_hat.in | 4 ++-- | 14 | scripts/blk_availability_init_red_hat.in | 4 ++-- |
11 | scripts/clvmd_init_red_hat.in | 6 +++--- | 15 | scripts/cmirrord_init_red_hat.in | 4 ++-- |
12 | scripts/cmirrord_init_red_hat.in | 4 ++-- | 16 | scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++-- |
13 | scripts/lvm2_cluster_activation_red_hat.sh.in | 4 ++-- | 17 | scripts/lvm2_monitoring_init_red_hat.in | 4 ++-- |
14 | scripts/lvm2_lvmetad_init_red_hat.in | 4 ++-- | 18 | scripts/lvm2_monitoring_init_rhel4 | 4 ++-- |
15 | scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++-- | 19 | 5 files changed, 10 insertions(+), 10 deletions(-) |
16 | scripts/lvm2_monitoring_init_red_hat.in | 4 ++-- | ||
17 | scripts/lvm2_monitoring_init_rhel4 | 4 ++-- | ||
18 | 8 files changed, 17 insertions(+), 17 deletions(-) | ||
19 | 20 | ||
20 | Index: LVM2.2.02.177/scripts/blk_availability_init_red_hat.in | 21 | diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in |
21 | =================================================================== | 22 | index 347c395..b2e9cf9 100644 |
22 | --- LVM2.2.02.177.orig/scripts/blk_availability_init_red_hat.in | 23 | --- a/scripts/blk_availability_init_red_hat.in |
23 | +++ LVM2.2.02.177/scripts/blk_availability_init_red_hat.in | 24 | +++ b/scripts/blk_availability_init_red_hat.in |
24 | @@ -1,4 +1,4 @@ | 25 | @@ -1,4 +1,4 @@ |
25 | -#!/bin/bash | 26 | -#!/bin/bash |
26 | +#!/bin/sh | 27 | +#!/bin/sh |
@@ -35,38 +36,10 @@ Index: LVM2.2.02.177/scripts/blk_availability_init_red_hat.in | |||
35 | + echo "Usage: $0 {start|stop|status}" | 36 | + echo "Usage: $0 {start|stop|status}" |
36 | ;; | 37 | ;; |
37 | esac | 38 | esac |
38 | Index: LVM2.2.02.177/scripts/clvmd_init_red_hat.in | 39 | diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in |
39 | =================================================================== | 40 | index c82f8f5..a3a321d 100755 |
40 | --- LVM2.2.02.177.orig/scripts/clvmd_init_red_hat.in | 41 | --- a/scripts/cmirrord_init_red_hat.in |
41 | +++ LVM2.2.02.177/scripts/clvmd_init_red_hat.in | 42 | +++ b/scripts/cmirrord_init_red_hat.in |
42 | @@ -1,4 +1,4 @@ | ||
43 | -#!/bin/bash | ||
44 | +#!/bin/sh | ||
45 | # | ||
46 | # clvmd - Clustered LVM Daemon init script | ||
47 | # | ||
48 | @@ -161,7 +161,7 @@ restart() { | ||
49 | fi | ||
50 | } | ||
51 | |||
52 | -[ "$EUID" != "0" ] && { | ||
53 | +[ "$(id -u)" != "0" ] && { | ||
54 | echo "clvmd init script can only be executed as root user" | ||
55 | exit 4 | ||
56 | } | ||
57 | @@ -206,7 +206,7 @@ case "$1" in | ||
58 | ;; | ||
59 | |||
60 | *) | ||
61 | - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" | ||
62 | + echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" | ||
63 | rtrn=2 | ||
64 | ;; | ||
65 | esac | ||
66 | Index: LVM2.2.02.177/scripts/cmirrord_init_red_hat.in | ||
67 | =================================================================== | ||
68 | --- LVM2.2.02.177.orig/scripts/cmirrord_init_red_hat.in | ||
69 | +++ LVM2.2.02.177/scripts/cmirrord_init_red_hat.in | ||
70 | @@ -1,4 +1,4 @@ | 43 | @@ -1,4 +1,4 @@ |
71 | -#!/bin/bash | 44 | -#!/bin/bash |
72 | +#!/bin/sh | 45 | +#!/bin/sh |
@@ -82,48 +55,10 @@ Index: LVM2.2.02.177/scripts/cmirrord_init_red_hat.in | |||
82 | ;; | 55 | ;; |
83 | esac | 56 | esac |
84 | 57 | ||
85 | Index: LVM2.2.02.177/scripts/lvm2_cluster_activation_red_hat.sh.in | 58 | diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in |
86 | =================================================================== | 59 | index 176ff5d..825f6ad 100644 |
87 | --- LVM2.2.02.177.orig/scripts/lvm2_cluster_activation_red_hat.sh.in | 60 | --- a/scripts/lvm2_lvmpolld_init_red_hat.in |
88 | +++ LVM2.2.02.177/scripts/lvm2_cluster_activation_red_hat.sh.in | 61 | +++ b/scripts/lvm2_lvmpolld_init_red_hat.in |
89 | @@ -1,4 +1,4 @@ | ||
90 | -#!/bin/bash | ||
91 | +#!/bin/sh | ||
92 | |||
93 | sbindir="@SBINDIR@" | ||
94 | |||
95 | @@ -54,7 +54,7 @@ case "$1" in | ||
96 | rtrn=$? | ||
97 | ;; | ||
98 | *) | ||
99 | - echo $"Usage: $0 {activate|deactivate}" | ||
100 | + echo "Usage: $0 {activate|deactivate}" | ||
101 | rtrn=3 | ||
102 | ;; | ||
103 | esac | ||
104 | Index: LVM2.2.02.177/scripts/lvm2_lvmetad_init_red_hat.in | ||
105 | =================================================================== | ||
106 | --- LVM2.2.02.177.orig/scripts/lvm2_lvmetad_init_red_hat.in | ||
107 | +++ LVM2.2.02.177/scripts/lvm2_lvmetad_init_red_hat.in | ||
108 | @@ -1,4 +1,4 @@ | ||
109 | -#!/bin/bash | ||
110 | +#!/bin/sh | ||
111 | # | ||
112 | # Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved. | ||
113 | # | ||
114 | @@ -103,7 +103,7 @@ case "$1" in | ||
115 | ;; | ||
116 | |||
117 | *) | ||
118 | - echo $"Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}" | ||
119 | + echo "Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}" | ||
120 | ;; | ||
121 | esac | ||
122 | |||
123 | Index: LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in | ||
124 | =================================================================== | ||
125 | --- LVM2.2.02.177.orig/scripts/lvm2_lvmpolld_init_red_hat.in | ||
126 | +++ LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in | ||
127 | @@ -1,4 +1,4 @@ | 62 | @@ -1,4 +1,4 @@ |
128 | -#!/bin/bash | 63 | -#!/bin/bash |
129 | +#!/bin/sh | 64 | +#!/bin/sh |
@@ -139,10 +74,10 @@ Index: LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in | |||
139 | ;; | 74 | ;; |
140 | esac | 75 | esac |
141 | 76 | ||
142 | Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in | 77 | diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in |
143 | =================================================================== | 78 | index 95e4125..dff89cd 100644 |
144 | --- LVM2.2.02.177.orig/scripts/lvm2_monitoring_init_red_hat.in | 79 | --- a/scripts/lvm2_monitoring_init_red_hat.in |
145 | +++ LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in | 80 | +++ b/scripts/lvm2_monitoring_init_red_hat.in |
146 | @@ -1,4 +1,4 @@ | 81 | @@ -1,4 +1,4 @@ |
147 | -#!/bin/bash | 82 | -#!/bin/bash |
148 | +#!/bin/sh | 83 | +#!/bin/sh |
@@ -158,10 +93,10 @@ Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in | |||
158 | ;; | 93 | ;; |
159 | esac | 94 | esac |
160 | 95 | ||
161 | Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4 | 96 | diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 |
162 | =================================================================== | 97 | index 8eb06c5..2e8d0f7 100644 |
163 | --- LVM2.2.02.177.orig/scripts/lvm2_monitoring_init_rhel4 | 98 | --- a/scripts/lvm2_monitoring_init_rhel4 |
164 | +++ LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4 | 99 | +++ b/scripts/lvm2_monitoring_init_rhel4 |
165 | @@ -1,4 +1,4 @@ | 100 | @@ -1,4 +1,4 @@ |
166 | -#!/bin/bash | 101 | -#!/bin/bash |
167 | +#!/bin/sh | 102 | +#!/bin/sh |
@@ -177,3 +112,6 @@ Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4 | |||
177 | ;; | 112 | ;; |
178 | esac | 113 | esac |
179 | 114 | ||
115 | -- | ||
116 | 2.7.4 | ||
117 | |||
diff --git a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch index e3ce4c8ac..2124ebafe 100644 --- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch +++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 51d661ff33bb254d7b335a9c87acf5c6e7a94192 Mon Sep 17 00:00:00 2001 | 1 | From 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Tue, 31 Jul 2018 15:08:34 +0800 | 3 | Date: Mon, 26 Nov 2018 14:59:55 +0800 |
4 | Subject: [PATCH] do not build manual | 4 | Subject: [PATCH 2/3] do not build manual |
5 | 5 | ||
6 | On some host (ubuntu 1404), build manual failed. | 6 | On some host (ubuntu 1404), build manual failed. |
7 | ... | 7 | ... |
@@ -20,28 +20,28 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
20 | 2 files changed, 3 insertions(+), 4 deletions(-) | 20 | 2 files changed, 3 insertions(+), 4 deletions(-) |
21 | 21 | ||
22 | diff --git a/Makefile.in b/Makefile.in | 22 | diff --git a/Makefile.in b/Makefile.in |
23 | index e2f5a84..acf31e5 100644 | 23 | index 6a1a990..80cba91 100644 |
24 | --- a/Makefile.in | 24 | --- a/Makefile.in |
25 | +++ b/Makefile.in | 25 | +++ b/Makefile.in |
26 | @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ | 26 | @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ |
27 | abs_top_builddir = @abs_top_builddir@ | 27 | abs_top_builddir = @abs_top_builddir@ |
28 | abs_top_srcdir = @abs_top_srcdir@ | 28 | abs_top_srcdir = @abs_top_srcdir@ |
29 | 29 | ||
30 | -SUBDIRS = conf daemons include lib libdaemon libdm man scripts device_mapper tools | 30 | -SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools |
31 | +SUBDIRS = conf daemons include lib libdaemon libdm scripts device_mapper tools | 31 | +SUBDIRS = conf daemons include lib libdaemon libdm scripts tools |
32 | 32 | ||
33 | ifeq ("@UDEV_RULES@", "yes") | 33 | ifeq ("@UDEV_RULES@", "yes") |
34 | SUBDIRS += udev | 34 | SUBDIRS += udev |
35 | @@ -41,7 +41,7 @@ ifeq ($(MAKECMDGOALS),clean) | 35 | @@ -33,7 +33,7 @@ ifeq ($(MAKECMDGOALS),clean) |
36 | endif | 36 | endif |
37 | # FIXME Should use intermediate Makefiles here! | 37 | # FIXME Should use intermediate Makefiles here! |
38 | ifeq ($(MAKECMDGOALS),distclean) | 38 | ifeq ($(MAKECMDGOALS),distclean) |
39 | - SUBDIRS = conf include man test scripts \ | 39 | - SUBDIRS = conf include man test scripts \ |
40 | + SUBDIRS = conf include test scripts \ | 40 | + SUBDIRS = conf include test scripts \ |
41 | libdaemon lib tools daemons libdm \ | 41 | libdaemon lib tools daemons libdm \ |
42 | udev po liblvm python device_mapper | 42 | udev po |
43 | tools.distclean: test.distclean | 43 | tools.distclean: test.distclean |
44 | @@ -71,7 +71,7 @@ liblvm.device-mapper: include.device-mapper | 44 | @@ -59,7 +59,7 @@ libdm.device-mapper: include.device-mapper |
45 | daemons.device-mapper: libdm.device-mapper | 45 | daemons.device-mapper: libdm.device-mapper |
46 | tools.device-mapper: libdm.device-mapper | 46 | tools.device-mapper: libdm.device-mapper |
47 | scripts.device-mapper: include.device-mapper | 47 | scripts.device-mapper: include.device-mapper |
@@ -51,17 +51,17 @@ index e2f5a84..acf31e5 100644 | |||
51 | ifeq ("@INTL@", "yes") | 51 | ifeq ("@INTL@", "yes") |
52 | lib.pofile: include.pofile | 52 | lib.pofile: include.pofile |
53 | diff --git a/configure.ac b/configure.ac | 53 | diff --git a/configure.ac b/configure.ac |
54 | index aa374ea..5a92cba 100644 | 54 | index 9c45745..8fee4c4 100644 |
55 | --- a/configure.ac | 55 | --- a/configure.ac |
56 | +++ b/configure.ac | 56 | +++ b/configure.ac |
57 | @@ -2124,7 +2124,6 @@ libdm/Makefile | 57 | @@ -1806,7 +1806,6 @@ libdaemon/server/Makefile |
58 | libdm/Makefile | ||
59 | libdm/dm-tools/Makefile | ||
58 | libdm/libdevmapper.pc | 60 | libdm/libdevmapper.pc |
59 | liblvm/Makefile | ||
60 | liblvm/liblvm2app.pc | ||
61 | -man/Makefile | 61 | -man/Makefile |
62 | po/Makefile | 62 | po/Makefile |
63 | python/Makefile | 63 | scripts/blkdeactivate.sh |
64 | python/setup.py | 64 | scripts/blk_availability_init_red_hat |
65 | -- | 65 | -- |
66 | 2.7.4 | 66 | 2.7.4 |
67 | 67 | ||
diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.02.180.bb b/meta-oe/recipes-support/lvm2/libdevmapper_2.03.01.bb index 26af3275d..2c4febbe0 100644 --- a/meta-oe/recipes-support/lvm2/libdevmapper_2.02.180.bb +++ b/meta-oe/recipes-support/lvm2/libdevmapper_2.03.01.bb | |||
@@ -1,7 +1,6 @@ | |||
1 | require lvm2.inc | 1 | require lvm2.inc |
2 | 2 | ||
3 | SRC_URI[md5sum] = "bc26da66e96727babbd288bb0f050339" | 3 | SRCREV = "913c28917e62577a2ef67152b2e5159237503dda" |
4 | SRC_URI[sha256sum] = "24997e26dfc916151707c9da504d38d0473bec3481a8230b676bc079041bead6" | ||
5 | 4 | ||
6 | DEPENDS += "autoconf-archive-native" | 5 | DEPENDS += "autoconf-archive-native" |
7 | 6 | ||
@@ -9,7 +8,6 @@ TARGET_CC_ARCH += "${LDFLAGS}" | |||
9 | 8 | ||
10 | do_install() { | 9 | do_install() { |
11 | oe_runmake 'DESTDIR=${D}' -C libdm install | 10 | oe_runmake 'DESTDIR=${D}' -C libdm install |
12 | oe_runmake 'DESTDIR=${D}' -C tools install_device-mapper | ||
13 | } | 11 | } |
14 | 12 | ||
15 | RRECOMMENDS_${PN}_append_class-target = " lvm2-udevrules" | 13 | RRECOMMENDS_${PN}_append_class-target = " lvm2-udevrules" |
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 26a887ea1..66b082847 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ | |||
7 | 7 | ||
8 | DEPENDS += "util-linux libaio" | 8 | DEPENDS += "util-linux libaio" |
9 | 9 | ||
10 | SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ | 10 | SRC_URI = "git://github.com/lvmteam/lvm2.git;protocol=https;branch=master \ |
11 | file://lvm.conf \ | 11 | file://lvm.conf \ |
12 | file://0001-implement-libc-specific-reopen_stream.patch \ | 12 | file://0001-implement-libc-specific-reopen_stream.patch \ |
13 | file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ | 13 | file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ |
@@ -21,11 +21,11 @@ SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ | |||
21 | UPSTREAM_CHECK_URI = "ftp://sources.redhat.com/pub/lvm2/" | 21 | UPSTREAM_CHECK_URI = "ftp://sources.redhat.com/pub/lvm2/" |
22 | UPSTREAM_CHECK_REGEX = "LVM2\.(?P<pver>\d+(\.\d+)+)" | 22 | UPSTREAM_CHECK_REGEX = "LVM2\.(?P<pver>\d+(\.\d+)+)" |
23 | 23 | ||
24 | S = "${WORKDIR}/LVM2.${PV}" | 24 | S = "${WORKDIR}/git" |
25 | 25 | ||
26 | inherit autotools-brokensep pkgconfig systemd license | 26 | inherit autotools-brokensep pkgconfig systemd license |
27 | 27 | ||
28 | LVM2_PACKAGECONFIG = "dmeventd lvmetad" | 28 | LVM2_PACKAGECONFIG = "dmeventd" |
29 | LVM2_PACKAGECONFIG_append_class-target = " \ | 29 | LVM2_PACKAGECONFIG_append_class-target = " \ |
30 | ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ | 30 | ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ |
31 | ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ | 31 | ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ |
@@ -39,7 +39,6 @@ LVM2_PACKAGECONFIG_append_class-target = " \ | |||
39 | PACKAGECONFIG ??= "odirect ${LVM2_PACKAGECONFIG}" | 39 | PACKAGECONFIG ??= "odirect ${LVM2_PACKAGECONFIG}" |
40 | 40 | ||
41 | PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" | 41 | PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" |
42 | PACKAGECONFIG[lvmetad] = "--enable-lvmetad,--disable-lvmetad" | ||
43 | PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" | 42 | PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" |
44 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" | 43 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" |
45 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | 44 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" |
@@ -50,7 +49,6 @@ PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${n | |||
50 | EXTRA_OECONF = "--with-user= \ | 49 | EXTRA_OECONF = "--with-user= \ |
51 | --with-group= \ | 50 | --with-group= \ |
52 | --enable-realtime \ | 51 | --enable-realtime \ |
53 | --enable-applib \ | ||
54 | --enable-cmdlib \ | 52 | --enable-cmdlib \ |
55 | --enable-pkgconfig \ | 53 | --enable-pkgconfig \ |
56 | --with-usrlibdir=${libdir} \ | 54 | --with-usrlibdir=${libdir} \ |
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 7f5dd9334..8b805fc1a 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 | |||
@@ -1,6 +1,6 @@ | |||
1 | From 5a3e13ae94318c2bed60f875bb3852c45ce0113c Mon Sep 17 00:00:00 2001 | 1 | From 3c16d9aaa46602e7594d717d86e7f02066d21134 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Thu, 25 May 2017 05:27:11 -0400 | 3 | Date: Mon, 26 Nov 2018 17:20:20 +0800 |
4 | Subject: [PATCH] explicitly do not install libdm | 4 | Subject: [PATCH] explicitly do not install libdm |
5 | 5 | ||
6 | Already have package libdevmapper which split from lvm2, | 6 | Already have package libdevmapper which split from lvm2, |
@@ -9,17 +9,16 @@ explicitly do not do the installation here. | |||
9 | Upstream-Status: Inappropriate [meta-oe specific] | 9 | Upstream-Status: Inappropriate [meta-oe specific] |
10 | 10 | ||
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
12 | Signed-off-by: Andrew Bresticker <abrestic@waymo.com> | ||
13 | --- | 12 | --- |
14 | libdm/Makefile.in | 6 ++++-- | 13 | libdm/Makefile.in | 6 ++++-- |
15 | tools/Makefile.in | 3 ++- | 14 | libdm/dm-tools/Makefile.in | 6 ++++-- |
16 | 2 files changed, 6 insertions(+), 3 deletions(-) | 15 | 2 files changed, 8 insertions(+), 4 deletions(-) |
17 | 16 | ||
18 | diff --git a/libdm/Makefile.in b/libdm/Makefile.in | 17 | diff --git a/libdm/Makefile.in b/libdm/Makefile.in |
19 | index 66ec39513..c779c9d86 100644 | 18 | index 8c8334a..effcf25 100644 |
20 | --- a/libdm/Makefile.in | 19 | --- a/libdm/Makefile.in |
21 | +++ b/libdm/Makefile.in | 20 | +++ b/libdm/Makefile.in |
22 | @@ -77,9 +77,11 @@ ifeq ("@PKGCONFIG@", "yes") | 21 | @@ -81,9 +81,11 @@ ifeq ("@PKGCONFIG@", "yes") |
23 | INSTALL_TYPE += install_pkgconfig | 22 | INSTALL_TYPE += install_pkgconfig |
24 | endif | 23 | endif |
25 | 24 | ||
@@ -33,11 +32,11 @@ index 66ec39513..c779c9d86 100644 | |||
33 | 32 | ||
34 | install_include: $(srcdir)/libdevmapper.h | 33 | install_include: $(srcdir)/libdevmapper.h |
35 | $(INSTALL_DATA) -D $< $(includedir)/$(<F) | 34 | $(INSTALL_DATA) -D $< $(includedir)/$(<F) |
36 | diff --git a/tools/Makefile.in b/tools/Makefile.in | 35 | diff --git a/libdm/dm-tools/Makefile.in b/libdm/dm-tools/Makefile.in |
37 | index 103b76732..63ba7fc04 100644 | 36 | index 39d411d..4a0f61a 100644 |
38 | --- a/tools/Makefile.in | 37 | --- a/libdm/dm-tools/Makefile.in |
39 | +++ b/tools/Makefile.in | 38 | +++ b/libdm/dm-tools/Makefile.in |
40 | @@ -267,7 +267,8 @@ install_dmsetup_static: dmsetup.static | 39 | @@ -60,9 +60,11 @@ install_dmsetup_static: dmsetup.static |
41 | $(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) | 40 | $(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) |
42 | $(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats | 41 | $(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats |
43 | 42 | ||
@@ -45,8 +44,12 @@ index 103b76732..63ba7fc04 100644 | |||
45 | +install_device-mapper: | 44 | +install_device-mapper: |
46 | + echo "Do not install device mapper in lvm2" | 45 | + echo "Do not install device mapper in lvm2" |
47 | 46 | ||
48 | install_lvm2: $(INSTALL_LVM_TARGETS) | 47 | -install: install_device-mapper |
48 | +install: | ||
49 | + echo "Do not install device mapper in lvm2" | ||
49 | 50 | ||
51 | # dmfilemapd support | ||
52 | ifeq ("@BUILD_DMFILEMAPD@", "yes") | ||
50 | -- | 53 | -- |
51 | 2.19.0.397.gdd90340f6a-goog | 54 | 2.7.4 |
52 | 55 | ||
diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.02.180.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.01.bb index 7bd7b09d8..b28acf1c4 100644 --- a/meta-oe/recipes-support/lvm2/lvm2_2.02.180.bb +++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.01.bb | |||
@@ -1,7 +1,6 @@ | |||
1 | require lvm2.inc | 1 | require lvm2.inc |
2 | 2 | ||
3 | SRC_URI[md5sum] = "bc26da66e96727babbd288bb0f050339" | 3 | SRCREV = "913c28917e62577a2ef67152b2e5159237503dda" |
4 | SRC_URI[sha256sum] = "24997e26dfc916151707c9da504d38d0473bec3481a8230b676bc079041bead6" | ||
5 | 4 | ||
6 | SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch" | 5 | SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch" |
7 | 6 | ||
@@ -32,7 +31,6 @@ PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" | |||
32 | 31 | ||
33 | SYSTEMD_PACKAGES = "${PN}" | 32 | SYSTEMD_PACKAGES = "${PN}" |
34 | SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ | 33 | SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ |
35 | ${@bb.utils.contains('PACKAGECONFIG', 'lvmetad', 'lvm2-lvmetad.socket lvm2-pvscan@.service', '', d)} \ | ||
36 | blk-availability.service" | 34 | blk-availability.service" |
37 | SYSTEMD_AUTO_ENABLE = "disable" | 35 | SYSTEMD_AUTO_ENABLE = "disable" |
38 | 36 | ||