1*4882a593SmuzhiyunFrom 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Hongxu Jia <hongxu.jia@windriver.com> 3*4882a593SmuzhiyunDate: Mon, 26 Nov 2018 14:59:55 +0800 4*4882a593SmuzhiyunSubject: [PATCH 2/3] do not build manual 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunOn some host (ubuntu 1404), build manual failed. 7*4882a593Smuzhiyun... 8*4882a593Smuzhiyun./tools/man-generator --primary lvscan lvscan.8_des 9*4882a593SmuzhiyunFailed to stat description file lvscan.8_des. 10*4882a593Smuzhiyun... 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunDo not build man to workaround the issue. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunUpstream-Status: Pending 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunSigned-off-by: Hongxu Jia <hongxu.jia@windriver.com> 17*4882a593Smuzhiyun 18*4882a593Smuzhiyun 19*4882a593SmuzhiyunUpdate context for lvm2 2.03.02. 20*4882a593Smuzhiyun 21*4882a593SmuzhiyunSigned-off-by: Kai Kang <kai.kang@windriver.com> 22*4882a593Smuzhiyun--- 23*4882a593Smuzhiyun Makefile.in | 6 +++--- 24*4882a593Smuzhiyun configure.ac | 1 - 25*4882a593Smuzhiyun 2 files changed, 3 insertions(+), 4 deletions(-) 26*4882a593Smuzhiyun 27*4882a593Smuzhiyundiff --git a/Makefile.in b/Makefile.in 28*4882a593Smuzhiyunindex 6a1a990..80cba91 100644 29*4882a593Smuzhiyun--- a/Makefile.in 30*4882a593Smuzhiyun+++ b/Makefile.in 31*4882a593Smuzhiyun@@ -18,7 +18,7 @@ top_builddir = @top_builddir@ 32*4882a593Smuzhiyun abs_top_builddir = @abs_top_builddir@ 33*4882a593Smuzhiyun abs_top_srcdir = @abs_top_srcdir@ 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun-SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools 36*4882a593Smuzhiyun+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun ifeq ("@UDEV_RULES@", "yes") 39*4882a593Smuzhiyun SUBDIRS += udev 40*4882a593Smuzhiyun@@ -33,7 +33,7 @@ ifeq ($(MAKECMDGOALS),clean) 41*4882a593Smuzhiyun endif 42*4882a593Smuzhiyun # FIXME Should use intermediate Makefiles here! 43*4882a593Smuzhiyun ifeq ($(MAKECMDGOALS),distclean) 44*4882a593Smuzhiyun- SUBDIRS = conf include man test scripts \ 45*4882a593Smuzhiyun+ SUBDIRS = conf include test scripts \ 46*4882a593Smuzhiyun libdaemon lib tools daemons libdm \ 47*4882a593Smuzhiyun udev po 48*4882a593Smuzhiyun tools.distclean: test.distclean 49*4882a593Smuzhiyun@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper 50*4882a593Smuzhiyun daemons.device-mapper: libdm.device-mapper 51*4882a593Smuzhiyun tools.device-mapper: libdm.device-mapper 52*4882a593Smuzhiyun scripts.device-mapper: include.device-mapper 53*4882a593Smuzhiyun-device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper 54*4882a593Smuzhiyun+device-mapper: tools.device-mapper daemons.device-mapper 55*4882a593Smuzhiyun 56*4882a593Smuzhiyun ifeq ("@INTL@", "yes") 57*4882a593Smuzhiyun lib.pofile: include.pofile 58*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 59*4882a593Smuzhiyunindex 7fd0561..4154dc0 100644 60*4882a593Smuzhiyun--- a/configure.ac 61*4882a593Smuzhiyun+++ b/configure.ac 62*4882a593Smuzhiyun@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile 63*4882a593Smuzhiyun libdm/Makefile 64*4882a593Smuzhiyun libdm/dm-tools/Makefile 65*4882a593Smuzhiyun libdm/libdevmapper.pc 66*4882a593Smuzhiyun-man/Makefile 67*4882a593Smuzhiyun po/Makefile 68*4882a593Smuzhiyun scripts/lvm2-pvscan.service 69*4882a593Smuzhiyun scripts/blkdeactivate.sh 70*4882a593Smuzhiyun-- 71*4882a593Smuzhiyun2.7.4 72*4882a593Smuzhiyun 73