diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2017-08-02 04:05:49 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-13 13:20:57 +0200 |
commit | 2d78e2cfabb3f1bd38d8e298e52932685df7f863 (patch) | |
tree | 127ef3566f2db786305c723c02bc6500cc4454a6 /meta-oe | |
parent | da4d3edde64ba43d99567a5ce9696df5df3cd824 (diff) | |
download | meta-openembedded-contrib-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>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch | 58 | ||||
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2.inc | 1 |
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 0000000000..15aa9f5002 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch @@ -0,0 +1,58 @@ +From d8bb25e34d6533ba78eaae697771ee499a66706f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 2 Aug 2017 03:41:37 -0400 +Subject: [PATCH] do not build manual + +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. + +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(-) + +diff --git a/Makefile.in b/Makefile.in +index 31d428d..24f89a2 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 + + ifeq ("@UDEV_RULES@", "yes") + SUBDIRS += udev +@@ -69,7 +69,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 +-device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper ++device-mapper: tools.device-mapper daemons.device-mapper + + 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 + libdm/libdevmapper.pc + liblvm/Makefile + liblvm/liblvm2app.pc +-man/Makefile + po/Makefile + python/Makefile + python/setup.py +-- +2.8.1 + diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index c2dac952f4..179b0443fc 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 \ file://0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \ file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \ file://0001-Avoid-bashisms-in-init-scripts.patch \ + file://0005-do-not-build-manual.patch \ " S = "${WORKDIR}/LVM2.${PV}" |