diff options
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.patch | 15 |
1 files changed, 6 insertions, 9 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 7979efbefb..f7a85b4b3f 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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001 | 1 | From 8657541b91b4f2bd05ce14ec9899ff5f9f3b7d4c Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Mon, 26 Nov 2018 14:59:55 +0800 | 3 | Date: Mon, 26 Nov 2018 14:59:55 +0800 |
4 | Subject: [PATCH 2/3] do not build manual | 4 | Subject: [PATCH] do not build manual |
5 | 5 | ||
6 | On some host (ubuntu 1404), build manual failed. | 6 | On some host (ubuntu 1404), build manual failed. |
7 | ... | 7 | ... |
@@ -26,7 +26,7 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | |||
26 | 2 files changed, 3 insertions(+), 4 deletions(-) | 26 | 2 files changed, 3 insertions(+), 4 deletions(-) |
27 | 27 | ||
28 | diff --git a/Makefile.in b/Makefile.in | 28 | diff --git a/Makefile.in b/Makefile.in |
29 | index 3b7e0ec..37f14eb 100644 | 29 | index 06c4b1823..90df7b09c 100644 |
30 | --- a/Makefile.in | 30 | --- a/Makefile.in |
31 | +++ b/Makefile.in | 31 | +++ b/Makefile.in |
32 | @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ | 32 | @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ |
@@ -47,7 +47,7 @@ index 3b7e0ec..37f14eb 100644 | |||
47 | libdaemon lib tools daemons libdm \ | 47 | libdaemon lib tools daemons libdm \ |
48 | udev po | 48 | udev po |
49 | tools.distclean: test.distclean | 49 | tools.distclean: test.distclean |
50 | @@ -59,7 +59,7 @@ unit-test run-unit-test: test | 50 | @@ -59,7 +59,7 @@ unit-test run-unit-test: test libdm |
51 | 51 | ||
52 | daemons.device-mapper: libdm.device-mapper | 52 | daemons.device-mapper: libdm.device-mapper |
53 | tools.device-mapper: libdm.device-mapper | 53 | tools.device-mapper: libdm.device-mapper |
@@ -57,10 +57,10 @@ index 3b7e0ec..37f14eb 100644 | |||
57 | 57 | ||
58 | ifeq ("@INTL@", "yes") | 58 | ifeq ("@INTL@", "yes") |
59 | diff --git a/configure.ac b/configure.ac | 59 | diff --git a/configure.ac b/configure.ac |
60 | index 6def519..18a5c97 100644 | 60 | index 3af73c781..f32d1f376 100644 |
61 | --- a/configure.ac | 61 | --- a/configure.ac |
62 | +++ b/configure.ac | 62 | +++ b/configure.ac |
63 | @@ -2018,7 +2018,6 @@ libdaemon/server/Makefile | 63 | @@ -2076,7 +2076,6 @@ libdaemon/server/Makefile |
64 | libdm/Makefile | 64 | libdm/Makefile |
65 | libdm/dm-tools/Makefile | 65 | libdm/dm-tools/Makefile |
66 | libdm/libdevmapper.pc | 66 | libdm/libdevmapper.pc |
@@ -68,6 +68,3 @@ index 6def519..18a5c97 100644 | |||
68 | po/Makefile | 68 | po/Makefile |
69 | scripts/lvm2-pvscan.service | 69 | scripts/lvm2-pvscan.service |
70 | scripts/blkdeactivate.sh | 70 | scripts/blkdeactivate.sh |
71 | -- | ||
72 | 2.25.1 | ||
73 | |||