summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch')
-rw-r--r--meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch23
1 files changed, 12 insertions, 11 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
index 7117d99a39..7979efbefb 100644
--- 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
@@ -15,25 +15,26 @@ Upstream-Status: Pending
15 15
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17 17
18
19Update context for lvm2 2.03.02. 18Update context for lvm2 2.03.02.
20
21Signed-off-by: Kai Kang <kai.kang@windriver.com> 19Signed-off-by: Kai Kang <kai.kang@windriver.com>
20
21Update context for lvm2 2.03.16.
22Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
22--- 23---
23 Makefile.in | 6 +++--- 24 Makefile.in | 6 +++---
24 configure.ac | 1 - 25 configure.ac | 1 -
25 2 files changed, 3 insertions(+), 4 deletions(-) 26 2 files changed, 3 insertions(+), 4 deletions(-)
26 27
27diff --git a/Makefile.in b/Makefile.in 28diff --git a/Makefile.in b/Makefile.in
28index 6a1a990..80cba91 100644 29index 3b7e0ec..37f14eb 100644
29--- a/Makefile.in 30--- a/Makefile.in
30+++ b/Makefile.in 31+++ b/Makefile.in
31@@ -18,7 +18,7 @@ top_builddir = @top_builddir@ 32@@ -18,7 +18,7 @@ top_builddir = @top_builddir@
32 abs_top_builddir = @abs_top_builddir@ 33 abs_top_builddir = @abs_top_builddir@
33 abs_top_srcdir = @abs_top_srcdir@ 34 abs_top_srcdir = @abs_top_srcdir@
34 35
35-SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools 36-SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools
36+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools 37+SUBDIRS = libdm conf daemons include lib libdaemon scripts tools
37 38
38 ifeq ("@UDEV_RULES@", "yes") 39 ifeq ("@UDEV_RULES@", "yes")
39 SUBDIRS += udev 40 SUBDIRS += udev
@@ -46,20 +47,20 @@ index 6a1a990..80cba91 100644
46 libdaemon lib tools daemons libdm \ 47 libdaemon lib tools daemons libdm \
47 udev po 48 udev po
48 tools.distclean: test.distclean 49 tools.distclean: test.distclean
49@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper 50@@ -59,7 +59,7 @@ unit-test run-unit-test: test
51
50 daemons.device-mapper: libdm.device-mapper 52 daemons.device-mapper: libdm.device-mapper
51 tools.device-mapper: libdm.device-mapper 53 tools.device-mapper: libdm.device-mapper
52 scripts.device-mapper: include.device-mapper
53-device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper 54-device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
54+device-mapper: tools.device-mapper daemons.device-mapper 55+device-mapper: tools.device-mapper daemons.device-mapper
56 device_mapper: device-mapper
55 57
56 ifeq ("@INTL@", "yes") 58 ifeq ("@INTL@", "yes")
57 lib.pofile: include.pofile
58diff --git a/configure.ac b/configure.ac 59diff --git a/configure.ac b/configure.ac
59index 7fd0561..4154dc0 100644 60index 6def519..18a5c97 100644
60--- a/configure.ac 61--- a/configure.ac
61+++ b/configure.ac 62+++ b/configure.ac
62@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile 63@@ -2018,7 +2018,6 @@ libdaemon/server/Makefile
63 libdm/Makefile 64 libdm/Makefile
64 libdm/dm-tools/Makefile 65 libdm/dm-tools/Makefile
65 libdm/libdevmapper.pc 66 libdm/libdevmapper.pc
@@ -68,5 +69,5 @@ index 7fd0561..4154dc0 100644
68 scripts/lvm2-pvscan.service 69 scripts/lvm2-pvscan.service
69 scripts/blkdeactivate.sh 70 scripts/blkdeactivate.sh
70-- 71--
712.7.4 722.25.1
72 73