[oe-commits] Khem Raj : systemd_git.bb: Add patch to disable --nonet option
git version control
git at git.openembedded.org
Fri Jul 1 07:01:55 UTC 2011
Module: meta-openembedded.git
Branch: master
Commit: 6965f7ab28a356437f600c362650ba8a721ad3e9
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=6965f7ab28a356437f600c362650ba8a721ad3e9
Author: Khem Raj <raj.khem at gmail.com>
Date: Fri Jul 1 13:43:13 2011 +0000
systemd_git.bb: Add patch to disable --nonet option
Hi I am not particularly happy with this patch but by letting xsltproc
download stylesheets from internet it atleast compiles the thing. But
its very slow. So any better solution if someone has suggestion please
by all means
-Khem
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
.../systemd/systemd/use-nonet-for-docbook.patch | 30 ++++++++++++++++++++
meta-oe/recipes-core/systemd/systemd_git.bb | 3 +-
2 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/meta-oe/recipes-core/systemd/systemd/use-nonet-for-docbook.patch b/meta-oe/recipes-core/systemd/systemd/use-nonet-for-docbook.patch
new file mode 100644
index 0000000..e8aa537
--- /dev/null
+++ b/meta-oe/recipes-core/systemd/systemd/use-nonet-for-docbook.patch
@@ -0,0 +1,30 @@
+We get errors like
+
+| /bin/mkdir -p man/ && /home/kraj/work/angstrom/build/tmp-angstrom_2010_x-uclibc/sysroots/x86_64-linux/usr/bin/xsltproc -o man/systemd.1 --nonet --param funcsynopsis.style
+ "'ansi'" http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl man/systemd.xml
+| I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
+| warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
+| cannot parse http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
+| make[1]: *** [man/systemd.1] Error 4
+| make[1]: Leaving directory `/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-uclibc/work/armv5teb-angstrom-linux-uclibceabi/systemd-git-r4/git'
+| make: *** [all] Error 2
+| + die 'oe_runmake failed'
+| + bbfatal 'oe_runmake failed'
+| + echo 'ERROR: oe_runmake failed'
+| ERROR: oe_runmake failed
+| + exit 1
+
+This patch disables --nonet option to xsltproc
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+
+--- git/Makefile.am.org 2011-06-30 16:07:21.715269183 -0700
++++ git/Makefile.am 2011-06-30 16:07:26.805269182 -0700
+@@ -1315,7 +1315,6 @@ endif
+
+ if HAVE_XSLTPROC
+ XSLTPROC_FLAGS = \
+- --nonet \
+ --param funcsynopsis.style "'ansi'"
+
+ XSLTPROC_PROCESS_MAN = \
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index c750b2f..40b93b8 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -15,7 +15,7 @@ inherit gitpkgv
PKGV = "v${GITPKGVTAG}"
PV = "git"
-PR = "r4"
+PR = "r5"
inherit autotools vala
@@ -24,6 +24,7 @@ SRCREV = "8585357a0e5e9f4d56e999d7cd1a73e77ae0eb80"
SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
file://paper-over-mkostemp.patch \
+ file://use-nonet-for-docbook.patch \
"
S = "${WORKDIR}/git"
More information about the Openembedded-commits
mailing list