diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/lvm2')
9 files changed, 137 insertions, 108 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch index e86ab25e6..5b55111dc 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch @@ -17,17 +17,17 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> scripts/lvm2_monitoring_init_rhel4 | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) -diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in -index a84ffe7..6b855b7 100644 ---- a/scripts/blk_availability_init_red_hat.in -+++ b/scripts/blk_availability_init_red_hat.in +Index: LVM2.2.02.177/scripts/blk_availability_init_red_hat.in +=================================================================== +--- LVM2.2.02.177.orig/scripts/blk_availability_init_red_hat.in ++++ LVM2.2.02.177/scripts/blk_availability_init_red_hat.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # - # Copyright (C) 2012 Red Hat, Inc. All rights reserved. + # Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved. # -@@ -53,6 +53,6 @@ case "$1" in +@@ -51,6 +51,6 @@ case "$1" in status) ;; *) @@ -35,10 +35,10 @@ index a84ffe7..6b855b7 100644 + echo "Usage: $0 {start|stop|status}" ;; esac -diff --git a/scripts/clvmd_init_red_hat.in b/scripts/clvmd_init_red_hat.in -index d7f3392..abc8011 100644 ---- a/scripts/clvmd_init_red_hat.in -+++ b/scripts/clvmd_init_red_hat.in +Index: LVM2.2.02.177/scripts/clvmd_init_red_hat.in +=================================================================== +--- LVM2.2.02.177.orig/scripts/clvmd_init_red_hat.in ++++ LVM2.2.02.177/scripts/clvmd_init_red_hat.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh @@ -63,17 +63,17 @@ index d7f3392..abc8011 100644 rtrn=2 ;; esac -diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in -index d4b7e37..d442cbc 100755 ---- a/scripts/cmirrord_init_red_hat.in -+++ b/scripts/cmirrord_init_red_hat.in +Index: LVM2.2.02.177/scripts/cmirrord_init_red_hat.in +=================================================================== +--- LVM2.2.02.177.orig/scripts/cmirrord_init_red_hat.in ++++ LVM2.2.02.177/scripts/cmirrord_init_red_hat.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # chkconfig: - 22 78 # description: Starts and stops cmirrord -@@ -101,7 +101,7 @@ case "$1" in +@@ -103,7 +103,7 @@ case "$1" in ;; *) @@ -82,15 +82,15 @@ index d4b7e37..d442cbc 100755 ;; esac -diff --git a/scripts/lvm2_cluster_activation_red_hat.sh.in b/scripts/lvm2_cluster_activation_red_hat.sh.in -index abea026..d8cba2e 100644 ---- a/scripts/lvm2_cluster_activation_red_hat.sh.in -+++ b/scripts/lvm2_cluster_activation_red_hat.sh.in +Index: LVM2.2.02.177/scripts/lvm2_cluster_activation_red_hat.sh.in +=================================================================== +--- LVM2.2.02.177.orig/scripts/lvm2_cluster_activation_red_hat.sh.in ++++ LVM2.2.02.177/scripts/lvm2_cluster_activation_red_hat.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh - sbindir=@sbindir@ + sbindir="@SBINDIR@" @@ -54,7 +54,7 @@ case "$1" in rtrn=$? @@ -101,17 +101,17 @@ index abea026..d8cba2e 100644 rtrn=3 ;; esac -diff --git a/scripts/lvm2_lvmetad_init_red_hat.in b/scripts/lvm2_lvmetad_init_red_hat.in -index b2f5d50..96269a9 100644 ---- a/scripts/lvm2_lvmetad_init_red_hat.in -+++ b/scripts/lvm2_lvmetad_init_red_hat.in +Index: LVM2.2.02.177/scripts/lvm2_lvmetad_init_red_hat.in +=================================================================== +--- LVM2.2.02.177.orig/scripts/lvm2_lvmetad_init_red_hat.in ++++ LVM2.2.02.177/scripts/lvm2_lvmetad_init_red_hat.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # - # Copyright (C) 2012 Red Hat, Inc. All rights reserved. + # Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved. # -@@ -105,7 +105,7 @@ case "$1" in +@@ -103,7 +103,7 @@ case "$1" in ;; *) @@ -120,17 +120,17 @@ index b2f5d50..96269a9 100644 ;; esac -diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in -index c521955..cdbaece 100644 ---- a/scripts/lvm2_lvmpolld_init_red_hat.in -+++ b/scripts/lvm2_lvmpolld_init_red_hat.in +Index: LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in +=================================================================== +--- LVM2.2.02.177.orig/scripts/lvm2_lvmpolld_init_red_hat.in ++++ LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Copyright (C) 2015 Red Hat, Inc. All rights reserved. # -@@ -107,7 +107,7 @@ case "$1" in +@@ -105,7 +105,7 @@ case "$1" in ;; *) @@ -139,17 +139,17 @@ index c521955..cdbaece 100644 ;; esac -diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in -index de7ff0d..9ff6bb7 100644 ---- a/scripts/lvm2_monitoring_init_red_hat.in -+++ b/scripts/lvm2_monitoring_init_red_hat.in +Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in +=================================================================== +--- LVM2.2.02.177.orig/scripts/lvm2_monitoring_init_red_hat.in ++++ LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved. # -@@ -128,7 +128,7 @@ case "$1" in +@@ -127,7 +127,7 @@ case "$1" in ;; *) @@ -158,10 +158,10 @@ index de7ff0d..9ff6bb7 100644 ;; esac -diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 -index 8eb06c5..2e8d0f7 100644 ---- a/scripts/lvm2_monitoring_init_rhel4 -+++ b/scripts/lvm2_monitoring_init_rhel4 +Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4 +=================================================================== +--- LVM2.2.02.177.orig/scripts/lvm2_monitoring_init_rhel4 ++++ LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh @@ -177,6 +177,3 @@ index 8eb06c5..2e8d0f7 100644 ;; esac --- -2.12.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch index 5d72402bd..bb582ed1f 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch @@ -19,11 +19,11 @@ Signed-off-by: Dengke Du <dengke.du@windriver.com> tools/lvmcmdline.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) -diff --git a/lib/log/log.c b/lib/log/log.c -index c933154..3581084 100644 ---- a/lib/log/log.c -+++ b/lib/log/log.c -@@ -161,6 +161,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ +Index: LVM2.2.02.177/lib/log/log.c +=================================================================== +--- LVM2.2.02.177.orig/lib/log/log.c ++++ LVM2.2.02.177/lib/log/log.c +@@ -161,6 +161,7 @@ static void _check_and_replace_standard_ * Close and reopen standard stream on file descriptor fd. */ int reopen_standard_stream(FILE **stream, const char *mode) @@ -31,7 +31,7 @@ index c933154..3581084 100644 { int fd, fd_copy, new_fd; const char *name; -@@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream, const char *mode) +@@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream *stream = new_stream; return 1; } @@ -43,11 +43,11 @@ index c933154..3581084 100644 void init_log_fn(lvm2_log_fn_t log_fn) { -diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c -index 9a4deb7..f1f18e6 100644 ---- a/tools/lvmcmdline.c -+++ b/tools/lvmcmdline.c -@@ -1818,7 +1818,7 @@ static int _check_standard_fds(void) +Index: LVM2.2.02.177/tools/lvmcmdline.c +=================================================================== +--- LVM2.2.02.177.orig/tools/lvmcmdline.c ++++ LVM2.2.02.177/tools/lvmcmdline.c +@@ -3095,7 +3095,7 @@ static int _check_standard_fds(void) int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && @@ -56,7 +56,7 @@ index 9a4deb7..f1f18e6 100644 if (err) perror("stdin stream open"); else -@@ -1828,7 +1828,7 @@ static int _check_standard_fds(void) +@@ -3105,7 +3105,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDOUT_FILENO) && @@ -65,7 +65,7 @@ index 9a4deb7..f1f18e6 100644 if (err) perror("stdout stream open"); /* else no stdout */ -@@ -1836,7 +1836,7 @@ static int _check_standard_fds(void) +@@ -3113,7 +3113,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDERR_FILENO) && @@ -74,6 +74,3 @@ index 9a4deb7..f1f18e6 100644 printf("stderr stream open: %s\n", strerror(errno)); return 0; --- -2.12.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch index 95dcede33..ce8a97ab6 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch @@ -12,11 +12,11 @@ Signed-off-by: Dengke Du <dengke.du@windriver.com> lib/mm/memlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c -index da90144..f34f890 100644 ---- a/lib/mm/memlock.c -+++ b/lib/mm/memlock.c -@@ -150,7 +150,7 @@ static void _touch_memory(void *mem, size_t size) +Index: LVM2.2.02.177/lib/mm/memlock.c +=================================================================== +--- LVM2.2.02.177.orig/lib/mm/memlock.c ++++ LVM2.2.02.177/lib/mm/memlock.c +@@ -151,7 +151,7 @@ static void _touch_memory(void *mem, siz static void _allocate_memory(void) { @@ -25,6 +25,3 @@ index da90144..f34f890 100644 void *stack_mem; struct rlimit limit; int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; --- -2.12.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch index aaeaa725d..517b9a5f2 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch @@ -1,6 +1,6 @@ -From 0012ea63f6070a5d41fa380970f9c30b953237d2 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Tue, 25 Oct 2016 11:59:40 +0000 +From 3bba45890985b877b823836e78a1c8ac3c878856 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Tue, 31 Jul 2018 15:04:29 +0800 Subject: [PATCH 4/4] tweak MODPROBE_CMD for cross compile Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe @@ -16,23 +16,23 @@ filter=["r|/loop1$|","r|/loop2$|","r|/loop3$|","r|/loop4$|","r|/loop5$|","r|/loo Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Signed-off-by: Dengke Du <dengke.du@windriver.com> --- - configure.in | 1 - - 1 file changed, 1 deletion(-) + configure.ac | 2 -- + 1 file changed, 2 deletions(-) -diff --git a/configure.in b/configure.in -index cc77aab..a3579f2 100644 ---- a/configure.in -+++ b/configure.in -@@ -1853,7 +1853,6 @@ if test "$UDEV_SYNC" = yes; then +diff --git a/configure.ac b/configure.ac +index e427708..aa374ea 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1791,8 +1791,6 @@ if test "$BUILD_DMFILEMAPD" = yes; then fi ################################################################################ --AC_PATH_TOOL(MODPROBE_CMD, modprobe) - +-AC_PATH_TOOL(MODPROBE_CMD, modprobe, [], [$PATH_SBIN]) +- if test -n "$MODPROBE_CMD"; then AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) + fi -- -2.9.3 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch index 15aa9f500..e3ce4c8ac 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch @@ -1,6 +1,6 @@ -From d8bb25e34d6533ba78eaae697771ee499a66706f Mon Sep 17 00:00:00 2001 +From 51d661ff33bb254d7b335a9c87acf5c6e7a94192 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 2 Aug 2017 03:41:37 -0400 +Date: Tue, 31 Jul 2018 15:08:34 +0800 Subject: [PATCH] do not build manual On some host (ubuntu 1404), build manual failed. @@ -15,24 +15,33 @@ Upstream-Status: Pending Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - Makefile.in | 4 ++-- - configure.in | 1 - - 2 files changed, 2 insertions(+), 3 deletions(-) + Makefile.in | 6 +++--- + configure.ac | 1 - + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 31d428d..24f89a2 100644 +index e2f5a84..acf31e5 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 = conf daemons include lib libdaemon libdm man scripts device_mapper tools ++SUBDIRS = conf daemons include lib libdaemon libdm scripts device_mapper tools ifeq ("@UDEV_RULES@", "yes") SUBDIRS += udev -@@ -69,7 +69,7 @@ liblvm.device-mapper: include.device-mapper +@@ -41,7 +41,7 @@ ifeq ($(MAKECMDGOALS),clean) + endif + # FIXME Should use intermediate Makefiles here! + ifeq ($(MAKECMDGOALS),distclean) +- SUBDIRS = conf include man test scripts \ ++ SUBDIRS = conf include test scripts \ + libdaemon lib tools daemons libdm \ + udev po liblvm python device_mapper + tools.distclean: test.distclean +@@ -71,7 +71,7 @@ liblvm.device-mapper: include.device-mapper daemons.device-mapper: libdm.device-mapper tools.device-mapper: libdm.device-mapper scripts.device-mapper: include.device-mapper @@ -41,11 +50,11 @@ index 31d428d..24f89a2 100644 ifeq ("@INTL@", "yes") lib.pofile: include.pofile -diff --git a/configure.in b/configure.in -index 1dc8819..108ace4 100644 ---- a/configure.in -+++ b/configure.in -@@ -2213,7 +2213,6 @@ libdm/Makefile +diff --git a/configure.ac b/configure.ac +index aa374ea..5a92cba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2124,7 +2124,6 @@ libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc @@ -54,5 +63,5 @@ index 1dc8819..108ace4 100644 python/Makefile python/setup.py -- -2.8.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.02.180.bb index b6ae90240..26af3275d 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.02.180.bb @@ -1,7 +1,7 @@ require lvm2.inc -SRC_URI[md5sum] = "153b7bb643eb26073274968e9026fa8f" -SRC_URI[sha256sum] = "b815a711a2fabaa5c3dc1a4a284df0268bf0f325f0fc0f5c9530c9bbb54b9964" +SRC_URI[md5sum] = "bc26da66e96727babbd288bb0f050339" +SRC_URI[sha256sum] = "24997e26dfc916151707c9da504d38d0473bec3481a8230b676bc079041bead6" DEPENDS += "autoconf-archive-native" @@ -9,6 +9,7 @@ TARGET_CC_ARCH += "${LDFLAGS}" do_install() { oe_runmake 'DESTDIR=${D}' -C libdm install + oe_runmake 'DESTDIR=${D}' -C tools install_device-mapper } RRECOMMENDS_${PN}_append_class-target = " lvm2-udevrules" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index 289e07d8d..26a887ea1 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -1,11 +1,11 @@ HOMEPAGE = "https://www.sourceware.org/lvm2/" SECTION = "utils" DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux." -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" -DEPENDS += "util-linux" +DEPENDS += "util-linux libaio" SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ file://lvm.conf \ @@ -17,6 +17,10 @@ SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ file://0005-do-not-build-manual.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ " + +UPSTREAM_CHECK_URI = "ftp://sources.redhat.com/pub/lvm2/" +UPSTREAM_CHECK_REGEX = "LVM2\.(?P<pver>\d+(\.\d+)+)" + S = "${WORKDIR}/LVM2.${PV}" inherit autotools-brokensep pkgconfig systemd license diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch index e85818dbd..7f5dd9334 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch @@ -1,4 +1,4 @@ -From 0a8e466fcf99622896e070c5133165e4278e8cfb Mon Sep 17 00:00:00 2001 +From 5a3e13ae94318c2bed60f875bb3852c45ce0113c Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Thu, 25 May 2017 05:27:11 -0400 Subject: [PATCH] explicitly do not install libdm @@ -9,12 +9,14 @@ explicitly do not do the installation here. Upstream-Status: Inappropriate [meta-oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Andrew Bresticker <abrestic@waymo.com> --- libdm/Makefile.in | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) + tools/Makefile.in | 3 ++- + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libdm/Makefile.in b/libdm/Makefile.in -index 3c9a4ce..45c91c6 100644 +index 66ec39513..c779c9d86 100644 --- a/libdm/Makefile.in +++ b/libdm/Makefile.in @@ -77,9 +77,11 @@ ifeq ("@PKGCONFIG@", "yes") @@ -23,14 +25,28 @@ index 3c9a4ce..45c91c6 100644 -install: $(INSTALL_TYPE) install_include +install: -+ echo "Do not install device mappler in lvm2" ++ echo "Do not install device mapper in lvm2" -install_device-mapper: install +install_device-mapper: -+ echo "Do not install device mappler in lvm2" ++ echo "Do not install device mapper in lvm2" install_include: $(srcdir)/libdevmapper.h $(INSTALL_DATA) -D $< $(includedir)/$(<F) +diff --git a/tools/Makefile.in b/tools/Makefile.in +index 103b76732..63ba7fc04 100644 +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -267,7 +267,8 @@ install_dmsetup_static: dmsetup.static + $(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) + $(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats + +-install_device-mapper: $(INSTALL_DMSETUP_TARGETS) ++install_device-mapper: ++ echo "Do not install device mapper in lvm2" + + install_lvm2: $(INSTALL_LVM_TARGETS) + -- -2.8.1 +2.19.0.397.gdd90340f6a-goog diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.02.180.bb index 84881e744..7bd7b09d8 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.02.180.bb @@ -1,12 +1,16 @@ require lvm2.inc -SRC_URI[md5sum] = "153b7bb643eb26073274968e9026fa8f" -SRC_URI[sha256sum] = "b815a711a2fabaa5c3dc1a4a284df0268bf0f325f0fc0f5c9530c9bbb54b9964" +SRC_URI[md5sum] = "bc26da66e96727babbd288bb0f050339" +SRC_URI[sha256sum] = "24997e26dfc916151707c9da504d38d0473bec3481a8230b676bc079041bead6" SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch" DEPENDS += "autoconf-archive-native" +inherit multilib_script + +MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf" + CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" do_install_append() { @@ -34,6 +38,8 @@ SYSTEMD_AUTO_ENABLE = "disable" TARGET_CC_ARCH += "${LDFLAGS}" +EXTRA_OECONF_append_class-nativesdk = " --with-confdir=${sysconfdir}" + FILES_${PN} += "${libdir}/device-mapper/*.so" FILES_${PN}-scripts = " \ ${sbindir}/blkdeactivate \ @@ -44,7 +50,9 @@ 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}-udevrules = "${PN}" RDEPENDS_${PN}_append_class-target = " libdevmapper" +RDEPENDS_${PN}_append_class-nativesdk = " libdevmapper" RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) bash" RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" |
