mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 02:50:46 +00:00
lvm2/libdevmapper: upgrade 2.03.11 -> 2.03.16
0005-do-not-build-manual.patch 0006-start-lvm2-monitor.service-after-tmp.mount.patch refreshed for new version. Add bash to RDEPENDS. Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -15,25 +15,26 @@ Upstream-Status: Pending
|
||||
|
||||
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>
|
||||
|
||||
Update context for lvm2 2.03.16.
|
||||
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
|
||||
---
|
||||
Makefile.in | 6 +++---
|
||||
configure.ac | 1 -
|
||||
2 files changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 6a1a990..80cba91 100644
|
||||
index 3b7e0ec..37f14eb 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -18,7 +18,7 @@ top_builddir = @top_builddir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
abs_top_srcdir = @abs_top_srcdir@
|
||||
|
||||
-SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools
|
||||
+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools
|
||||
-SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools
|
||||
+SUBDIRS = libdm conf daemons include lib libdaemon scripts tools
|
||||
|
||||
ifeq ("@UDEV_RULES@", "yes")
|
||||
SUBDIRS += udev
|
||||
@@ -46,20 +47,20 @@ index 6a1a990..80cba91 100644
|
||||
libdaemon lib tools daemons libdm \
|
||||
udev po
|
||||
tools.distclean: test.distclean
|
||||
@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper
|
||||
@@ -59,7 +59,7 @@ unit-test run-unit-test: test
|
||||
|
||||
daemons.device-mapper: libdm.device-mapper
|
||||
tools.device-mapper: libdm.device-mapper
|
||||
scripts.device-mapper: include.device-mapper
|
||||
-device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
|
||||
+device-mapper: tools.device-mapper daemons.device-mapper
|
||||
device_mapper: device-mapper
|
||||
|
||||
ifeq ("@INTL@", "yes")
|
||||
lib.pofile: include.pofile
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7fd0561..4154dc0 100644
|
||||
index 6def519..18a5c97 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile
|
||||
@@ -2018,7 +2018,6 @@ libdaemon/server/Makefile
|
||||
libdm/Makefile
|
||||
libdm/dm-tools/Makefile
|
||||
libdm/libdevmapper.pc
|
||||
@@ -68,5 +69,5 @@ index 7fd0561..4154dc0 100644
|
||||
scripts/lvm2-pvscan.service
|
||||
scripts/blkdeactivate.sh
|
||||
--
|
||||
2.7.4
|
||||
2.25.1
|
||||
|
||||
|
||||
+7
-4
@@ -11,23 +11,26 @@ Upstream-Status: Inappropriate [oe specific]
|
||||
|
||||
Rebase to v2_03_05
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
Rebase to v2_03_16
|
||||
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
|
||||
---
|
||||
scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in
|
||||
index 4bf744a..46766cb 100644
|
||||
index c0c96e3..2a99a37 100644
|
||||
--- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
|
||||
+++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
|
||||
@@ -2,7 +2,7 @@
|
||||
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
|
||||
-After=dm-event.socket dm-event.service lvm2-activation.service
|
||||
+After=dm-event.socket dm-event.service lvm2-activation.service tmp.mount
|
||||
-After=dm-event.socket dm-event.service
|
||||
+After=dm-event.socket dm-event.service tmp.mount
|
||||
Before=local-fs-pre.target shutdown.target
|
||||
DefaultDependencies=no
|
||||
Conflicts=shutdown.target
|
||||
--
|
||||
2.7.4
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
|
||||
file://reproducible-build.patch \
|
||||
"
|
||||
|
||||
SRCREV = "3e8bd8d1bd70691f09a170785836aeb4f83154e6"
|
||||
SRCREV = "6d1e894a867681af7a811ed63bc435f3aa55fec8"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
|
||||
|
||||
+1
@@ -68,6 +68,7 @@ FILES:${PN}-scripts = " \
|
||||
# Specified explicitly for the udev rules, just in case that it does not get picked
|
||||
# up automatically:
|
||||
FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
|
||||
RDEPENDS:${PN} = "bash"
|
||||
RDEPENDS:${PN}-udevrules = "libdevmapper"
|
||||
RDEPENDS:${PN}:append:class-target = " libdevmapper"
|
||||
RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
|
||||
Reference in New Issue
Block a user