Gitiles
Code Review Sign In
gerrit.openbmc.org / mdmillerii / openbmc / 0434ea6e914574ea9770d16190bba6dbbefa19f3 / . / meta-openembedded / meta-oe / recipes-support / lvm2 / files / 0005-do-not-build-manual.patch
blob: 7979efbefb1f8ea807e27f4d01de479a5dc2b929 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]1From 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]2From: Hongxu Jia <hongxu.jia@windriver.com>
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]3Date: Mon, 26 Nov 2018 14:59:55 +0800
4Subject: [PATCH 2/3] do not build manual
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]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>
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]17
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]18Update context for lvm2 2.03.02.
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]19Signed-off-by: Kai Kang <kai.kang@windriver.com>
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame]20
21Update context for lvm2 2.03.16.
22Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]23---
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]24 Makefile.in | 6 +++---
25 configure.ac | 1 -
26 2 files changed, 3 insertions(+), 4 deletions(-)
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]27
28diff --git a/Makefile.in b/Makefile.in
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame]29index 3b7e0ec..37f14eb 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]30--- a/Makefile.in
31+++ b/Makefile.in
32@@ -18,7 +18,7 @@ top_builddir = @top_builddir@
33 abs_top_builddir = @abs_top_builddir@
34 abs_top_srcdir = @abs_top_srcdir@
35
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame]36-SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools
37+SUBDIRS = libdm conf daemons include lib libdaemon scripts tools
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]38
39 ifeq ("@UDEV_RULES@", "yes")
40 SUBDIRS += udev
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]41@@ -33,7 +33,7 @@ ifeq ($(MAKECMDGOALS),clean)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]42 endif
43 # FIXME Should use intermediate Makefiles here!
44 ifeq ($(MAKECMDGOALS),distclean)
45- SUBDIRS = conf include man test scripts \
46+ SUBDIRS = conf include test scripts \
47 libdaemon lib tools daemons libdm \
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]48 udev po
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]49 tools.distclean: test.distclean
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame]50@@ -59,7 +59,7 @@ unit-test run-unit-test: test
51
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]52 daemons.device-mapper: libdm.device-mapper
53 tools.device-mapper: libdm.device-mapper
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]54-device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
55+device-mapper: tools.device-mapper daemons.device-mapper
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame]56 device_mapper: device-mapper
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]57
58 ifeq ("@INTL@", "yes")
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]59diff --git a/configure.ac b/configure.ac
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame]60index 6def519..18a5c97 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]61--- a/configure.ac
62+++ b/configure.ac
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame]63@@ -2018,7 +2018,6 @@ libdaemon/server/Makefile
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]64 libdm/Makefile
65 libdm/dm-tools/Makefile
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]66 libdm/libdevmapper.pc
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]67-man/Makefile
68 po/Makefile
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]69 scripts/lvm2-pvscan.service
70 scripts/blkdeactivate.sh
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]71--
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame]722.25.1
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]73