diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch index e3ce4c8ac..7117d99a3 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch @@ -1,7 +1,7 @@ -From 51d661ff33bb254d7b335a9c87acf5c6e7a94192 Mon Sep 17 00:00:00 2001 +From 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 31 Jul 2018 15:08:34 +0800 -Subject: [PATCH] do not build manual +Date: Mon, 26 Nov 2018 14:59:55 +0800 +Subject: [PATCH 2/3] do not build manual On some host (ubuntu 1404), build manual failed. ... @@ -14,34 +14,39 @@ 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> --- Makefile.in | 6 +++--- configure.ac | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in -index e2f5a84..acf31e5 100644 +index 6a1a990..80cba91 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 device_mapper tools -+SUBDIRS = conf daemons include lib libdaemon libdm scripts device_mapper tools +-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 -@@ -41,7 +41,7 @@ ifeq ($(MAKECMDGOALS),clean) +@@ -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 liblvm python device_mapper + udev po tools.distclean: test.distclean -@@ -71,7 +71,7 @@ liblvm.device-mapper: include.device-mapper +@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper daemons.device-mapper: libdm.device-mapper tools.device-mapper: libdm.device-mapper scripts.device-mapper: include.device-mapper @@ -51,17 +56,17 @@ index e2f5a84..acf31e5 100644 ifeq ("@INTL@", "yes") lib.pofile: include.pofile diff --git a/configure.ac b/configure.ac -index aa374ea..5a92cba 100644 +index 7fd0561..4154dc0 100644 --- a/configure.ac +++ b/configure.ac -@@ -2124,7 +2124,6 @@ libdm/Makefile +@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile + libdm/Makefile + libdm/dm-tools/Makefile libdm/libdevmapper.pc - liblvm/Makefile - liblvm/liblvm2app.pc -man/Makefile po/Makefile - python/Makefile - python/setup.py + scripts/lvm2-pvscan.service + scripts/blkdeactivate.sh -- 2.7.4 |
