diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-04-29 00:07:54 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-04-30 08:25:13 +0200 |
commit | c688085b4c96c169ca853bf91b6fee54f4cd983d (patch) | |
tree | 070b33a9772fe555dd287da164d2b709a1174e5d /meta-oe/recipes-navigation/gpsd | |
parent | a243ddc2afff482914c3b75862cb5af7bf8c22a1 (diff) | |
download | meta-openembedded-c688085b4c96c169ca853bf91b6fee54f4cd983d.tar.gz |
gpsd: disable docs generation
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation/gpsd')
4 files changed, 52 insertions, 0 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch b/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch new file mode 100644 index 000000000..9db24326c --- /dev/null +++ b/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From ca1a781afbd68697ef2f573557f1f93ec7ab8d3c Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sun, 29 Apr 2012 00:05:59 +0200 | ||
4 | Subject: [PATCH] SConstruct: disable html and man docs building because | ||
5 | xmlto-native from OE is broken | ||
6 | |||
7 | It will try to load dtd and fail: | ||
8 | | xmlto man gpsctl.xml; mv `basename gpsctl.1` gpsctl.1 | ||
9 | | xmlto: /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate (status 3) | ||
10 | | xmlto: Fix document syntax or use --skip-validation option | ||
11 | | I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd | ||
12 | | /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml:8: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" | ||
13 | | "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> | ||
14 | | ^ | ||
15 | | I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd | ||
16 | | warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" | ||
17 | | validity error : Could not load the external subset "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" | ||
18 | | Document /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate | ||
19 | | mv: cannot stat `gpsctl.1': No such file or directory | ||
20 | | scons: *** [gpsctl.1] Error 1 | ||
21 | | scons: building terminated because of errors. | ||
22 | |||
23 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
24 | --- | ||
25 | SConstruct | 4 ++-- | ||
26 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
27 | |||
28 | diff --git a/SConstruct b/SConstruct | ||
29 | index 9c0f751..8236abb 100644 | ||
30 | --- a/SConstruct | ||
31 | +++ b/SConstruct | ||
32 | @@ -560,12 +560,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size); | ||
33 | |||
34 | |||
35 | manbuilder = mangenerator = htmlbuilder = None | ||
36 | -if config.CheckXsltproc(): | ||
37 | +if False and config.CheckXsltproc(): | ||
38 | mangenerator = 'xsltproc' | ||
39 | build = "xsltproc --nonet %s $SOURCE >$TARGET" | ||
40 | htmlbuilder = build % docbook_html_uri | ||
41 | manbuilder = build % docbook_man_uri | ||
42 | -elif WhereIs("xmlto"): | ||
43 | +elif False and WhereIs("xmlto"): | ||
44 | mangenerator = 'xmlto' | ||
45 | htmlbuilder = "xmlto html-nochunks $SOURCE; mv `basename $TARGET` $TARGET" | ||
46 | manbuilder = "xmlto man $SOURCE; mv `basename $TARGET` $TARGET" | ||
47 | -- | ||
48 | 1.7.8.6 | ||
49 | |||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb index 8cd806f4a..7f6d0ba31 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb | |||
@@ -11,6 +11,7 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ | |||
11 | file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ | 11 | file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ |
12 | file://0004-SConstruct-remove-rpath.patch \ | 12 | file://0004-SConstruct-remove-rpath.patch \ |
13 | file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ | 13 | file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ |
14 | file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \ | ||
14 | file://gpsd-default \ | 15 | file://gpsd-default \ |
15 | file://gpsd \ | 16 | file://gpsd \ |
16 | file://60-gpsd.rules \ | 17 | file://60-gpsd.rules \ |
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb index a1c8f9f7b..92060b2b2 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb | |||
@@ -12,6 +12,7 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ | |||
12 | file://0003-Revert-The-strptime-prototype-is-not-provided-unless.patch \ | 12 | file://0003-Revert-The-strptime-prototype-is-not-provided-unless.patch \ |
13 | file://0004-SConstruct-remove-rpath.patch \ | 13 | file://0004-SConstruct-remove-rpath.patch \ |
14 | file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ | 14 | file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ |
15 | file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \ | ||
15 | file://gpsd-default \ | 16 | file://gpsd-default \ |
16 | file://gpsd \ | 17 | file://gpsd \ |
17 | file://60-gpsd.rules \ | 18 | file://60-gpsd.rules \ |
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb index 68f0b9dc1..2d01a7724 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb | |||
@@ -16,6 +16,7 @@ SRC_URI = "git://git.sv.gnu.org/gpsd.git;protocol=git;branch=master \ | |||
16 | file://0003-Revert-The-strptime-prototype-is-not-provided-unless.patch \ | 16 | file://0003-Revert-The-strptime-prototype-is-not-provided-unless.patch \ |
17 | file://0004-SConstruct-remove-rpath.patch \ | 17 | file://0004-SConstruct-remove-rpath.patch \ |
18 | file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ | 18 | file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ |
19 | file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \ | ||
19 | file://gpsd-default \ | 20 | file://gpsd-default \ |
20 | file://gpsd \ | 21 | file://gpsd \ |
21 | file://60-gpsd.rules \ | 22 | file://60-gpsd.rules \ |