summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/xdg-utils
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-12-17 12:07:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-22 16:08:51 +0000
commit9a743882cb79af3da278415607ff9261a0c0a9d6 (patch)
tree5c6d9c04d6055cc918c1539f48c648a95698281f /meta/recipes-extended/xdg-utils
parent520b37dd0b7ac44614290740327a5d72fbb3c3ed (diff)
downloadpoky-9a743882cb79af3da278415607ff9261a0c0a9d6.tar.gz
xdg-utils: Do not build the in-script documentation
Building the contents for "--manual" option requires a web browser or java. That's bonkers so let's not do it. [YOCTO #8823] (From OE-Core rev: 35f4e506cd16a6165318c79030d5e54d06f1fd06) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/xdg-utils')
-rw-r--r--meta/recipes-extended/xdg-utils/xdg-utils/0001-Don-t-build-the-in-script-manual.patch30
-rw-r--r--meta/recipes-extended/xdg-utils/xdg-utils_1.1.1.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-extended/xdg-utils/xdg-utils/0001-Don-t-build-the-in-script-manual.patch b/meta/recipes-extended/xdg-utils/xdg-utils/0001-Don-t-build-the-in-script-manual.patch
new file mode 100644
index 0000000000..14160bf8df
--- /dev/null
+++ b/meta/recipes-extended/xdg-utils/xdg-utils/0001-Don-t-build-the-in-script-manual.patch
@@ -0,0 +1,30 @@
1From 33f42aa8d190b40be18cd0541b5881d46978b572 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Thu, 17 Dec 2015 11:50:05 +0200
4Subject: [PATCH] Don't build the in-script manual
5
6Building the contents for "--manual" option requires a web browser
7or java (these are the two options for "xmlto txt" support).
8That's bonkers so don't do it: the man pages are still available
9and contain the same info.
10
11Upstream-Status: Inappropriate [disables in-script docs]
12Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
13---
14 scripts/Makefile.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/scripts/Makefile.in b/scripts/Makefile.in
18index 430032d..85359bc 100644
19--- a/scripts/Makefile.in
20+++ b/scripts/Makefile.in
21@@ -112,5 +112,5 @@ html/%.html: desc/%.xml
22 (cd html;$(XMLTO) html-nochunks ../$<)
23
24 %.txt: desc/%.xml
25- $(XMLTO) txt $<
26+ echo "Please see the man pages." > $@
27
28--
292.1.4
30
diff --git a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.1.bb b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.1.bb
index 4f39594f75..6f66c6efc0 100644
--- a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.1.bb
+++ b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.1.bb
@@ -19,6 +19,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a5367a90934098d6b05af3b746405014"
19 19
20SRC_URI = "http://portland.freedesktop.org/download/${BPN}-${PV}.tar.gz \ 20SRC_URI = "http://portland.freedesktop.org/download/${BPN}-${PV}.tar.gz \
21 file://0001-Reinstate-xdg-terminal.patch \ 21 file://0001-Reinstate-xdg-terminal.patch \
22 file://0001-Don-t-build-the-in-script-manual.patch \
22 " 23 "
23 24
24SRC_URI[md5sum] = "2d0aec6037769a5f138ff404b1bb4b15" 25SRC_URI[md5sum] = "2d0aec6037769a5f138ff404b1bb4b15"