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-contrib-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 0000000000..9db24326cf --- /dev/null +++ b/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch @@ -0,0 +1,49 @@ +From ca1a781afbd68697ef2f573557f1f93ec7ab8d3c Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 29 Apr 2012 00:05:59 +0200 +Subject: [PATCH] SConstruct: disable html and man docs building because + xmlto-native from OE is broken + +It will try to load dtd and fail: +| xmlto man gpsctl.xml; mv `basename gpsctl.1` gpsctl.1 +| 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) +| xmlto: Fix document syntax or use --skip-validation option +| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd +| /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" +| "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> +| ^ +| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd +| warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" +| validity error : Could not load the external subset "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" +| 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 +| mv: cannot stat `gpsctl.1': No such file or directory +| scons: *** [gpsctl.1] Error 1 +| scons: building terminated because of errors. + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + SConstruct | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 9c0f751..8236abb 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -560,12 +560,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size); + + + manbuilder = mangenerator = htmlbuilder = None +-if config.CheckXsltproc(): ++if False and config.CheckXsltproc(): + mangenerator = 'xsltproc' + build = "xsltproc --nonet %s $SOURCE >$TARGET" + htmlbuilder = build % docbook_html_uri + manbuilder = build % docbook_man_uri +-elif WhereIs("xmlto"): ++elif False and WhereIs("xmlto"): + mangenerator = 'xmlto' + htmlbuilder = "xmlto html-nochunks $SOURCE; mv `basename $TARGET` $TARGET" + manbuilder = "xmlto man $SOURCE; mv `basename $TARGET` $TARGET" +-- +1.7.8.6 + diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb index 8cd806f4ab..7f6d0ba319 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 \ file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ file://0004-SConstruct-remove-rpath.patch \ file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ + file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \ file://gpsd-default \ file://gpsd \ 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 a1c8f9f7ba..92060b2b2c 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 \ file://0003-Revert-The-strptime-prototype-is-not-provided-unless.patch \ file://0004-SConstruct-remove-rpath.patch \ file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ + file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \ file://gpsd-default \ file://gpsd \ 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 68f0b9dc12..2d01a77244 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 \ file://0003-Revert-The-strptime-prototype-is-not-provided-unless.patch \ file://0004-SConstruct-remove-rpath.patch \ file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ + file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \ file://gpsd-default \ file://gpsd \ file://60-gpsd.rules \ |