lvm2/libdevmapper: 2.02.177 -> 2.02.180

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia
2018-08-01 15:21:33 +08:00
committed by Khem Raj
parent 9beba98f5e
commit 1ffb90072a
5 changed files with 51 additions and 36 deletions
@@ -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,20 +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(-)
Index: LVM2.2.02.177/configure.in
===================================================================
--- LVM2.2.02.177.orig/configure.in
+++ LVM2.2.02.177/configure.in
@@ -1870,7 +1870,6 @@ if test "$BUILD_DMFILEMAPD" = 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.7.4
@@ -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(-)
Index: LVM2.2.02.177/Makefile.in
===================================================================
--- LVM2.2.02.177.orig/Makefile.in
+++ LVM2.2.02.177/Makefile.in
diff --git a/Makefile.in b/Makefile.in
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-map
@@ -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: LVM2.2.02.177/Makefile.in
ifeq ("@INTL@", "yes")
lib.pofile: include.pofile
Index: LVM2.2.02.177/configure.in
===================================================================
--- LVM2.2.02.177.orig/configure.in
+++ LVM2.2.02.177/configure.in
@@ -2216,7 +2216,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
@@ -53,3 +62,6 @@ Index: LVM2.2.02.177/configure.in
po/Makefile
python/Makefile
python/setup.py
--
2.7.4
@@ -1,7 +1,7 @@
require lvm2.inc
SRC_URI[md5sum] = "ee6cfbc5a0c5696ffae79dac04ee7a2b"
SRC_URI[sha256sum] = "4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2"
SRC_URI[md5sum] = "bc26da66e96727babbd288bb0f050339"
SRC_URI[sha256sum] = "24997e26dfc916151707c9da504d38d0473bec3481a8230b676bc079041bead6"
DEPENDS += "autoconf-archive-native"
+2 -2
View File
@@ -5,9 +5,9 @@ LICENSE = "GPLv2 & LGPLv2"
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 \
SRC_URI = "ftp://sources.redhat.com/pub/lvm2/LVM2.${PV}.tgz \
file://lvm.conf \
file://0001-implement-libc-specific-reopen_stream.patch \
file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \
@@ -1,7 +1,7 @@
require lvm2.inc
SRC_URI[md5sum] = "ee6cfbc5a0c5696ffae79dac04ee7a2b"
SRC_URI[sha256sum] = "4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2"
SRC_URI[md5sum] = "bc26da66e96727babbd288bb0f050339"
SRC_URI[sha256sum] = "24997e26dfc916151707c9da504d38d0473bec3481a8230b676bc079041bead6"
SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch"