summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-07-01 13:43:13 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2011-07-01 09:00:01 +0200
commit6965f7ab28a356437f600c362650ba8a721ad3e9 (patch)
tree0b72e0167e8ce6f5298b071fd7f45d265d0f1e47 /meta-oe
parentc4f636ad336bf33d986f2bd11086067c18ea5bcc (diff)
downloadmeta-openembedded-6965f7ab28a356437f600c362650ba8a721ad3e9.tar.gz
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@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-core/systemd/systemd/use-nonet-for-docbook.patch30
-rw-r--r--meta-oe/recipes-core/systemd/systemd_git.bb3
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 000000000..e8aa537b4
--- /dev/null
+++ b/meta-oe/recipes-core/systemd/systemd/use-nonet-for-docbook.patch
@@ -0,0 +1,30 @@
1We get errors like
2
3| /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
4 "'ansi'" http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl man/systemd.xml
5| I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
6| warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
7| cannot parse http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
8| make[1]: *** [man/systemd.1] Error 4
9| make[1]: Leaving directory `/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-uclibc/work/armv5teb-angstrom-linux-uclibceabi/systemd-git-r4/git'
10| make: *** [all] Error 2
11| + die 'oe_runmake failed'
12| + bbfatal 'oe_runmake failed'
13| + echo 'ERROR: oe_runmake failed'
14| ERROR: oe_runmake failed
15| + exit 1
16
17This patch disables --nonet option to xsltproc
18
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20
21--- git/Makefile.am.org 2011-06-30 16:07:21.715269183 -0700
22+++ git/Makefile.am 2011-06-30 16:07:26.805269182 -0700
23@@ -1315,7 +1315,6 @@ endif
24
25 if HAVE_XSLTPROC
26 XSLTPROC_FLAGS = \
27- --nonet \
28 --param funcsynopsis.style "'ansi'"
29
30 XSLTPROC_PROCESS_MAN = \
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index c750b2f7c..40b93b8e5 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
15PKGV = "v${GITPKGVTAG}" 15PKGV = "v${GITPKGVTAG}"
16 16
17PV = "git" 17PV = "git"
18PR = "r4" 18PR = "r5"
19 19
20inherit autotools vala 20inherit autotools vala
21 21
@@ -24,6 +24,7 @@ SRCREV = "8585357a0e5e9f4d56e999d7cd1a73e77ae0eb80"
24SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \ 24SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
25 file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \ 25 file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
26 file://paper-over-mkostemp.patch \ 26 file://paper-over-mkostemp.patch \
27 file://use-nonet-for-docbook.patch \
27 " 28 "
28 29
29S = "${WORKDIR}/git" 30S = "${WORKDIR}/git"