aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch')
-rw-r--r--meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch31
1 files changed, 17 insertions, 14 deletions
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 2124ebafe8b..e7aaad4d0ec 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 @@
-From 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001
+From e0e06b77e067da6a01dd9b0d5582a0a1709c655d Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 26 Nov 2018 14:59:55 +0800
-Subject: [PATCH 2/3] do not build manual
+Subject: [PATCH] do not build manual
On some host (ubuntu 1404), build manual failed.
...
@@ -14,21 +14,27 @@ Do not build man to workaround the issue.
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 06c4b1823..90df7b09c 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
@@ -41,27 +47,24 @@ index 6a1a990..80cba91 100644
libdaemon lib tools daemons libdm \
udev po
tools.distclean: test.distclean
-@@ -59,7 +59,7 @@ libdm.device-mapper: include.device-mapper
+@@ -59,7 +59,7 @@ unit-test run-unit-test: test libdm
+
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 9c45745..8fee4c4 100644
+index 7c1c04627..5364dd68e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1806,7 +1806,6 @@ libdaemon/server/Makefile
+@@ -2022,7 +2022,6 @@ libdaemon/server/Makefile
libdm/Makefile
libdm/dm-tools/Makefile
libdm/libdevmapper.pc
-man/Makefile
po/Makefile
+ scripts/lvm2-pvscan.service
scripts/blkdeactivate.sh
- scripts/blk_availability_init_red_hat
---
-2.7.4
-