diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-07-28 09:20:24 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-07-28 09:20:24 +0200 |
commit | e74449cac02ff2b3e4bfd350443961062ec8abf8 (patch) | |
tree | 307a751fb2f775ee33e9fcbf4e414318dd510ffb /meta-oe/recipes-core | |
parent | 77d31f8d3027f6ef96bff61da4bf22cf9618bf21 (diff) | |
download | meta-openembedded-e74449cac02ff2b3e4bfd350443961062ec8abf8.tar.gz |
systemd: update to v31 + 2 bugfixes
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-core')
3 files changed, 21 insertions, 70 deletions
diff --git a/meta-oe/recipes-core/systemd/systemd/0001-systemd-disable-xml-file-stuff-and-introspection.patch b/meta-oe/recipes-core/systemd/systemd/0001-systemd-disable-xml-file-stuff-and-introspection.patch index d21174da0..61e3b0d5d 100644 --- a/meta-oe/recipes-core/systemd/systemd/0001-systemd-disable-xml-file-stuff-and-introspection.patch +++ b/meta-oe/recipes-core/systemd/systemd/0001-systemd-disable-xml-file-stuff-and-introspection.patch | |||
@@ -1,20 +1,20 @@ | |||
1 | From ef5128ced42e89514c36a6fba837d84f0d8c294d Mon Sep 17 00:00:00 2001 | 1 | From afc9b136758f0d9b77367dac73a7415ca33ed091 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Mon, 27 Jun 2011 15:44:41 +0200 | 3 | Date: Mon, 27 Jun 2011 15:44:41 +0200 |
4 | Subject: [PATCH] systemd: disable xml file stuff and introspection | 4 | Subject: [PATCH] systemd: disable xml file stuff and introspection |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 7 | --- |
8 | Makefile.am | 58 ++-------------------------------------------------------- | 8 | Makefile.am | 38 ++------------------------------------ |
9 | 1 files changed, 2 insertions(+), 56 deletions(-) | 9 | 1 files changed, 2 insertions(+), 36 deletions(-) |
10 | 10 | ||
11 | diff --git a/Makefile.am b/Makefile.am | 11 | diff --git a/Makefile.am b/Makefile.am |
12 | index bfc1079..f23e060 100644 | 12 | index 15349a1..37a51aa 100644 |
13 | --- a/Makefile.am | 13 | --- a/Makefile.am |
14 | +++ b/Makefile.am | 14 | +++ b/Makefile.am |
15 | @@ -216,24 +216,6 @@ dist_dbussystemservice_DATA = \ | 15 | @@ -246,24 +246,6 @@ nodist_udevrules_DATA = \ |
16 | dist_udevrules_DATA = \ | 16 | src/73-seat-late.rules \ |
17 | src/99-systemd.rules | 17 | src/99-systemd.rules |
18 | 18 | ||
19 | -dbusinterface_DATA = \ | 19 | -dbusinterface_DATA = \ |
20 | - org.freedesktop.systemd1.Manager.xml \ | 20 | - org.freedesktop.systemd1.Manager.xml \ |
@@ -37,7 +37,7 @@ index bfc1079..f23e060 100644 | |||
37 | dist_bashcompletion_DATA = \ | 37 | dist_bashcompletion_DATA = \ |
38 | src/systemctl-bash-completion.sh | 38 | src/systemctl-bash-completion.sh |
39 | 39 | ||
40 | @@ -667,17 +649,10 @@ XML_FILES = \ | 40 | @@ -739,17 +721,10 @@ XML_FILES = \ |
41 | XML_IN_FILES = \ | 41 | XML_IN_FILES = \ |
42 | ${patsubst %.1,%.xml.in,${patsubst %.3,%.xml.in,${patsubst %.5,%.xml.in,${patsubst %.7,%.xml.in,${patsubst %.8,%.xml.in,$(nodist_man_MANS)}}}}} | 42 | ${patsubst %.1,%.xml.in,${patsubst %.3,%.xml.in,${patsubst %.5,%.xml.in,${patsubst %.7,%.xml.in,${patsubst %.8,%.xml.in,$(nodist_man_MANS)}}}}} |
43 | 43 | ||
@@ -56,15 +56,15 @@ index bfc1079..f23e060 100644 | |||
56 | 56 | ||
57 | systemd_SOURCES = \ | 57 | systemd_SOURCES = \ |
58 | src/main.c | 58 | src/main.c |
59 | @@ -1317,7 +1292,6 @@ CLEANFILES = \ | 59 | @@ -1504,7 +1479,6 @@ CLEANFILES = \ |
60 | $(nodist_systemunit_DATA) \ | 60 | $(nodist_systemunit_DATA) \ |
61 | $(nodist_userunit_DATA) \ | 61 | $(nodist_userunit_DATA) \ |
62 | $(nodist_man_MANS) \ | 62 | $(nodist_man_MANS) \ |
63 | - ${XML_IN_FILES:.xml.in=.html} \ | 63 | - ${XML_IN_FILES:.xml.in=.html} \ |
64 | $(pkgconfigdata_DATA) \ | 64 | $(pkgconfigdata_DATA) \ |
65 | src/org.freedesktop.systemd1.policy | 65 | $(pkgconfiglib_DATA) \ |
66 | 66 | $(nodist_polkitpolicy_DATA) \ | |
67 | @@ -1379,41 +1353,13 @@ man/%.8: man/%.xml | 67 | @@ -1569,17 +1543,9 @@ man/%.8: man/%.xml |
68 | man/%.8.in: man/%.xml.in | 68 | man/%.8.in: man/%.xml.in |
69 | $(XSLTPROC_PROCESS_MAN_IN) | 69 | $(XSLTPROC_PROCESS_MAN_IN) |
70 | 70 | ||
@@ -83,30 +83,6 @@ index bfc1079..f23e060 100644 | |||
83 | endif | 83 | endif |
84 | 84 | ||
85 | DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h | 85 | DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h |
86 | |||
87 | -org.freedesktop.systemd1.%.xml: systemd | ||
88 | - $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \ | ||
89 | - $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ | ||
90 | - $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp | ||
91 | - | ||
92 | -org.freedesktop.hostname1.xml: systemd-hostnamed | ||
93 | - $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \ | ||
94 | - $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ | ||
95 | - $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp | ||
96 | - | ||
97 | -org.freedesktop.locale1.xml: systemd-localed | ||
98 | - $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \ | ||
99 | - $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ | ||
100 | - $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp | ||
101 | - | ||
102 | -org.freedesktop.timedate1.xml: systemd-timedated | ||
103 | - $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \ | ||
104 | - $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ | ||
105 | - $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp | ||
106 | - | ||
107 | CLEANFILES += \ | ||
108 | $(dbusinterface_DATA) | ||
109 | |||
110 | -- | 86 | -- |
111 | 1.6.6.1 | 87 | 1.6.6.1 |
112 | 88 | ||
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 deleted file mode 100644 index e8aa537b4..000000000 --- a/meta-oe/recipes-core/systemd/systemd/use-nonet-for-docbook.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | We 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 | |||
17 | This patch disables --nonet option to xsltproc | ||
18 | |||
19 | Signed-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 bafdf9c27..7f6751c9c 100644 --- a/meta-oe/recipes-core/systemd/systemd_git.bb +++ b/meta-oe/recipes-core/systemd/systemd_git.bb | |||
@@ -18,11 +18,10 @@ PR = "r0" | |||
18 | 18 | ||
19 | inherit autotools vala | 19 | inherit autotools vala |
20 | 20 | ||
21 | SRCREV = "501c92c432c7bef452a2714c29519bdd45281a72" | 21 | SRCREV = "85f19d825e7504676f3a80c78c1d9a7ec35a3b3f" |
22 | 22 | ||
23 | SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \ | 23 | SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \ |
24 | file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \ | 24 | file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \ |
25 | file://use-nonet-for-docbook.patch \ | ||
26 | ${UCLIBCPATCHES} \ | 25 | ${UCLIBCPATCHES} \ |
27 | " | 26 | " |
28 | UCLIBCPATCHES = "" | 27 | UCLIBCPATCHES = "" |
@@ -42,6 +41,11 @@ EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \ | |||
42 | --disable-gtk \ | 41 | --disable-gtk \ |
43 | " | 42 | " |
44 | 43 | ||
44 | do_configure_prepend() { | ||
45 | # avoid network access | ||
46 | sed -i -e /nonet/d Makefile.am | ||
47 | } | ||
48 | |||
45 | do_install() { | 49 | do_install() { |
46 | autotools_do_install | 50 | autotools_do_install |
47 | # provided by a seperate recipe | 51 | # provided by a seperate recipe |
@@ -52,7 +56,7 @@ PACKAGES =+ "${PN}-gui" | |||
52 | 56 | ||
53 | FILES_${PN}-gui = "${bindir}/systemadm" | 57 | FILES_${PN}-gui = "${bindir}/systemadm" |
54 | 58 | ||
55 | FILES_${PN} = " ${base_bindir}/* \ | 59 | FILES_${PN} += " ${base_bindir}/* \ |
56 | ${datadir}/dbus-1/services \ | 60 | ${datadir}/dbus-1/services \ |
57 | ${datadir}/dbus-1/system-services \ | 61 | ${datadir}/dbus-1/system-services \ |
58 | ${datadir}/polkit-1 \ | 62 | ${datadir}/polkit-1 \ |
@@ -68,7 +72,8 @@ FILES_${PN} = " ${base_bindir}/* \ | |||
68 | ${libdir}/systemd \ | 72 | ${libdir}/systemd \ |
69 | " | 73 | " |
70 | 74 | ||
71 | FILES_${PN}-dbg += "${base_libdir}/systemd/.debug ${base_libdir}/systemd/*/.debug" | 75 | FILES_${PN}-dbg += "${base_libdir}/systemd/.debug ${base_libdir}/systemd/*/.debug ${base_libdir}/security/.debug/" |
76 | FILES_${PN}-dev += "${base_libdir}/security/*.la" | ||
72 | 77 | ||
73 | RDEPENDS_${PN} += "dbus-systemd udev-systemd" | 78 | RDEPENDS_${PN} += "dbus-systemd udev-systemd" |
74 | 79 | ||