From 1e5442714a02b63c81fd7566a6d1e60d27193819 Mon Sep 17 00:00:00 2001 From: Jim Somerville Date: Thu, 13 Aug 2015 10:59:04 -0400 Subject: lxc: doc: fix broken manpage build docbook2man fails to build the man pages in poky due to missing the ancient Davenport 3.0 DTD. Poky meta has the Oasis 3.1 version so upgrade to use that instead. Signed-off-by: Jim Somerville Signed-off-by: Bruce Ashfield --- .../lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch | 32 ++++++++++++++++++++++ recipes-containers/lxc/lxc_1.1.2.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch 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 new file mode 100644 index 00000000..5f9d7718 --- /dev/null +++ b/recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch @@ -0,0 +1,32 @@ +From 4cf207ffd64c6f815e62ecbbf25b5a378e707182 Mon Sep 17 00:00:00 2001 +Message-Id: <4cf207ffd64c6f815e62ecbbf25b5a378e707182.1439319694.git.Jim.Somerville@windriver.com> +From: Jim Somerville +Date: Tue, 11 Aug 2015 14:05:00 -0400 +Subject: [PATCH 1/1] lxc: doc: upgrade to use docbook 3.1 DTD + +docbook2man fails to build the man pages in poky +due to missing the ancient Davenport 3.0 DTD. +Poky meta has the Oasis 3.1 version so upgrade +to use that instead. + +Signed-off-by: Jim Somerville +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4972803..2e67b5e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -179,7 +179,7 @@ AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) + AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"]) + + if test "x$db2xman" = "xdocbook2man"; then +- docdtd="\"-//Davenport//DTD DocBook V3.0//EN\"" ++ docdtd="\"-//OASIS//DTD DocBook V3.1//EN\"" + else + docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"" + fi +-- +1.8.3.2 + diff --git a/recipes-containers/lxc/lxc_1.1.2.bb b/recipes-containers/lxc/lxc_1.1.2.bb index 77d226b3..7bbae88b 100644 --- a/recipes-containers/lxc/lxc_1.1.2.bb +++ b/recipes-containers/lxc/lxc_1.1.2.bb @@ -33,6 +33,7 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \ file://lxc-busybox-add-OpenSSH-support.patch \ file://make-some-OpenSSH-tools-optional.patch \ file://Generate-lxc-restore-net-properly.patch \ + file://lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch \ " SRC_URI[md5sum] = "3ebadacf5fe8bfe689fd7a09812b682c" -- cgit v1.2.3-54-g00ecf