summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-08-02 04:05:49 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-13 13:20:57 +0200
commit2d78e2cfabb3f1bd38d8e298e52932685df7f863 (patch)
tree127ef3566f2db786305c723c02bc6500cc4454a6
parentda4d3edde64ba43d99567a5ce9696df5df3cd824 (diff)
downloadmeta-openembedded-2d78e2cfabb3f1bd38d8e298e52932685df7f863.tar.gz
lvm2/libdevmapper: workaround build man failure
On some host (ubuntu 1404), build manual failed. ... ./tools/man-generator --primary lvscan lvscan.8_des Failed to stat description file lvscan.8_des. ... Do not build man to workaround the issue. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch58
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.inc1
2 files changed, 59 insertions, 0 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
new file mode 100644
index 000000000..15aa9f500
--- /dev/null
+++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
@@ -0,0 +1,58 @@
1From d8bb25e34d6533ba78eaae697771ee499a66706f Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 2 Aug 2017 03:41:37 -0400
4Subject: [PATCH] do not build manual
5
6On some host (ubuntu 1404), build manual failed.
7...
8./tools/man-generator --primary lvscan lvscan.8_des
9Failed to stat description file lvscan.8_des.
10...
11
12Do not build man to workaround the issue.
13
14Upstream-Status: Pending
15
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17---
18 Makefile.in | 4 ++--
19 configure.in | 1 -
20 2 files changed, 2 insertions(+), 3 deletions(-)
21
22diff --git a/Makefile.in b/Makefile.in
23index 31d428d..24f89a2 100644
24--- a/Makefile.in
25+++ b/Makefile.in
26@@ -18,7 +18,7 @@ top_builddir = @top_builddir@
27 abs_top_builddir = @abs_top_builddir@
28 abs_top_srcdir = @abs_top_srcdir@
29
30-SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools
31+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools
32
33 ifeq ("@UDEV_RULES@", "yes")
34 SUBDIRS += udev
35@@ -69,7 +69,7 @@ liblvm.device-mapper: include.device-mapper
36 daemons.device-mapper: libdm.device-mapper
37 tools.device-mapper: libdm.device-mapper
38 scripts.device-mapper: include.device-mapper
39-device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
40+device-mapper: tools.device-mapper daemons.device-mapper
41
42 ifeq ("@INTL@", "yes")
43 lib.pofile: include.pofile
44diff --git a/configure.in b/configure.in
45index 1dc8819..108ace4 100644
46--- a/configure.in
47+++ b/configure.in
48@@ -2213,7 +2213,6 @@ libdm/Makefile
49 libdm/libdevmapper.pc
50 liblvm/Makefile
51 liblvm/liblvm2app.pc
52-man/Makefile
53 po/Makefile
54 python/Makefile
55 python/setup.py
56--
572.8.1
58
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index c2dac952f..179b0443f 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -13,6 +13,7 @@ SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \
13 file://0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \ 13 file://0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \
14 file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \ 14 file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \
15 file://0001-Avoid-bashisms-in-init-scripts.patch \ 15 file://0001-Avoid-bashisms-in-init-scripts.patch \
16 file://0005-do-not-build-manual.patch \
16 " 17 "
17S = "${WORKDIR}/LVM2.${PV}" 18S = "${WORKDIR}/LVM2.${PV}"
18 19