citadel/meta-citadel/recipes-support/lvm2/files/0005-do-not-build-manual.patch

73 lines
2.0 KiB
Diff
Raw Normal View History

2019-01-15 12:34:27 -05:00
From 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001
2018-01-18 18:19:47 -05:00
From: Hongxu Jia <hongxu.jia@windriver.com>
2019-01-15 12:34:27 -05:00
Date: Mon, 26 Nov 2018 14:59:55 +0800
Subject: [PATCH 2/3] do not build manual
2018-01-18 18:19:47 -05:00
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>
Update context for lvm2 2.03.02.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
2018-01-18 18:19:47 -05:00
---
2019-01-15 12:34:27 -05:00
Makefile.in | 6 +++---
configure.ac | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
2018-01-18 18:19:47 -05:00
diff --git a/Makefile.in b/Makefile.in
2019-01-15 12:34:27 -05:00
index 6a1a990..80cba91 100644
2018-01-18 18:19:47 -05:00
--- 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
2019-01-15 12:34:27 -05:00
@@ -33,7 +33,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
tools.distclean: test.distclean
@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper
2018-01-18 18:19:47 -05:00
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
2019-01-15 12:34:27 -05:00
diff --git a/configure.ac b/configure.ac
index 7fd0561..4154dc0 100644
2019-01-15 12:34:27 -05:00
--- a/configure.ac
+++ b/configure.ac
@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile
2019-01-15 12:34:27 -05:00
libdm/Makefile
libdm/dm-tools/Makefile
2018-01-18 18:19:47 -05:00
libdm/libdevmapper.pc
-man/Makefile
po/Makefile
scripts/lvm2-pvscan.service
2019-01-15 12:34:27 -05:00
scripts/blkdeactivate.sh
2018-01-18 18:19:47 -05:00
--
2019-01-15 12:34:27 -05:00
2.7.4
2018-01-18 18:19:47 -05:00