diff options
author | Mingli Yu <Mingli.Yu@windriver.com> | 2018-10-22 16:12:51 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-10-22 04:41:50 -0400 |
commit | 87526423d572b435002f54c6e9e28e4591c53447 (patch) | |
tree | ffed2d291a84427256d6a47677977186bf38ef02 /recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch | |
parent | ce8f6fe10682d85f7e26ceb3e8ccbc6e01d2b869 (diff) | |
download | meta-virtualization-87526423d572b435002f54c6e9e28e4591c53447.tar.gz |
lxc: Upgrade to 3.0.2
* Refresh patch to avoid fuzz warnings
* Update to 3.0.2 as lxc-destroy failed when
system boot in nfs rootfs in lxc 3.0.1 as below:
# lxc-destroy -n test9
lxc-destroy: test9: utils.c: _recursive_rmdir: 149 Failed to delete /var/lib/lxc/test9
lxc-destroy: test9: lxccontainer.c: container_destroy: 2946 Failed to destroy directory "/var/lib/lxc/test9" for "test9"
Destroying test9 failed
Update to 3.0.2 to fix the above issue
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch')
-rw-r--r-- | recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch b/recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch index 5f9d7718..085ffe80 100644 --- a/recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch +++ b/recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From 4cf207ffd64c6f815e62ecbbf25b5a378e707182 Mon Sep 17 00:00:00 2001 | 1 | From 5190dce1a675dfcdf88e3b94bd48070ac180bacc Mon Sep 17 00:00:00 2001 |
2 | Message-Id: <4cf207ffd64c6f815e62ecbbf25b5a378e707182.1439319694.git.Jim.Somerville@windriver.com> | ||
3 | From: Jim Somerville <Jim.Somerville@windriver.com> | 2 | From: Jim Somerville <Jim.Somerville@windriver.com> |
4 | Date: Tue, 11 Aug 2015 14:05:00 -0400 | 3 | Date: Tue, 11 Aug 2015 14:05:00 -0400 |
5 | Subject: [PATCH 1/1] lxc: doc: upgrade to use docbook 3.1 DTD | 4 | Subject: [PATCH] lxc: doc: upgrade to use docbook 3.1 DTD |
6 | 5 | ||
7 | docbook2man fails to build the man pages in poky | 6 | docbook2man fails to build the man pages in poky |
8 | due to missing the ancient Davenport 3.0 DTD. | 7 | due to missing the ancient Davenport 3.0 DTD. |
@@ -10,15 +9,16 @@ Poky meta has the Oasis 3.1 version so upgrade | |||
10 | to use that instead. | 9 | to use that instead. |
11 | 10 | ||
12 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> | 11 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> |
12 | |||
13 | --- | 13 | --- |
14 | configure.ac | 2 +- | 14 | configure.ac | 2 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
18 | index 4972803..2e67b5e 100644 | 18 | index 1acc461..74b976a 100644 |
19 | --- a/configure.ac | 19 | --- a/configure.ac |
20 | +++ b/configure.ac | 20 | +++ b/configure.ac |
21 | @@ -179,7 +179,7 @@ AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) | 21 | @@ -213,7 +213,7 @@ AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) |
22 | AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"]) | 22 | AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"]) |
23 | 23 | ||
24 | if test "x$db2xman" = "xdocbook2man"; then | 24 | if test "x$db2xman" = "xdocbook2man"; then |
@@ -27,6 +27,3 @@ index 4972803..2e67b5e 100644 | |||
27 | else | 27 | else |
28 | docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"" | 28 | docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"" |
29 | fi | 29 | fi |
30 | -- | ||
31 | 1.8.3.2 | ||
32 | |||