From ffcbcabe67b4e0c69d167662dd906978a6d2693a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 28 Jul 2011 09:20:24 +0200 Subject: [PATCH] systemd: update to v31 + 2 bugfixes (From meta-openembedded rev: e74449cac02ff2b3e4bfd350443961062ec8abf8) Signed-off-by: Koen Kooi Signed-off-by: Patrick Ohly --- ...-disable-xml-file-stuff-and-introspection.patch | 48 ++++++---------------- .../systemd/systemd/use-nonet-for-docbook.patch | 30 -------------- .../meta-oe/recipes-core/systemd/systemd_git.bb | 13 ++++-- 3 files changed, 21 insertions(+), 70 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-core/systemd/systemd/use-nonet-for-docbook.patch diff --git a/meta-openembedded/meta-oe/recipes-core/systemd/systemd/0001-systemd-disable-xml-file-stuff-and-introspection.patch b/meta-openembedded/meta-oe/recipes-core/systemd/systemd/0001-systemd-disable-xml-file-stuff-and-introspection.patch index d21174d..61e3b0d 100644 --- a/meta-openembedded/meta-oe/recipes-core/systemd/systemd/0001-systemd-disable-xml-file-stuff-and-introspection.patch +++ b/meta-openembedded/meta-oe/recipes-core/systemd/systemd/0001-systemd-disable-xml-file-stuff-and-introspection.patch @@ -1,20 +1,20 @@ -From ef5128ced42e89514c36a6fba837d84f0d8c294d Mon Sep 17 00:00:00 2001 +From afc9b136758f0d9b77367dac73a7415ca33ed091 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 27 Jun 2011 15:44:41 +0200 Subject: [PATCH] systemd: disable xml file stuff and introspection Signed-off-by: Koen Kooi --- - Makefile.am | 58 ++-------------------------------------------------------- - 1 files changed, 2 insertions(+), 56 deletions(-) + Makefile.am | 38 ++------------------------------------ + 1 files changed, 2 insertions(+), 36 deletions(-) diff --git a/Makefile.am b/Makefile.am -index bfc1079..f23e060 100644 +index 15349a1..37a51aa 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -216,24 +216,6 @@ dist_dbussystemservice_DATA = \ - dist_udevrules_DATA = \ - src/99-systemd.rules +@@ -246,24 +246,6 @@ nodist_udevrules_DATA = \ + src/73-seat-late.rules \ + src/99-systemd.rules -dbusinterface_DATA = \ - org.freedesktop.systemd1.Manager.xml \ @@ -37,7 +37,7 @@ index bfc1079..f23e060 100644 dist_bashcompletion_DATA = \ src/systemctl-bash-completion.sh -@@ -667,17 +649,10 @@ XML_FILES = \ +@@ -739,17 +721,10 @@ XML_FILES = \ XML_IN_FILES = \ ${patsubst %.1,%.xml.in,${patsubst %.3,%.xml.in,${patsubst %.5,%.xml.in,${patsubst %.7,%.xml.in,${patsubst %.8,%.xml.in,$(nodist_man_MANS)}}}}} @@ -56,15 +56,15 @@ index bfc1079..f23e060 100644 systemd_SOURCES = \ src/main.c -@@ -1317,7 +1292,6 @@ CLEANFILES = \ +@@ -1504,7 +1479,6 @@ CLEANFILES = \ $(nodist_systemunit_DATA) \ $(nodist_userunit_DATA) \ $(nodist_man_MANS) \ - ${XML_IN_FILES:.xml.in=.html} \ $(pkgconfigdata_DATA) \ - src/org.freedesktop.systemd1.policy - -@@ -1379,41 +1353,13 @@ man/%.8: man/%.xml + $(pkgconfiglib_DATA) \ + $(nodist_polkitpolicy_DATA) \ +@@ -1569,17 +1543,9 @@ man/%.8: man/%.xml man/%.8.in: man/%.xml.in $(XSLTPROC_PROCESS_MAN_IN) @@ -83,30 +83,6 @@ index bfc1079..f23e060 100644 endif DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h - --org.freedesktop.systemd1.%.xml: systemd -- $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \ -- $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ -- $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp -- --org.freedesktop.hostname1.xml: systemd-hostnamed -- $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \ -- $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ -- $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp -- --org.freedesktop.locale1.xml: systemd-localed -- $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \ -- $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ -- $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp -- --org.freedesktop.timedate1.xml: systemd-timedated -- $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \ -- $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ -- $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp -- - CLEANFILES += \ - $(dbusinterface_DATA) - -- 1.6.6.1 diff --git a/meta-openembedded/meta-oe/recipes-core/systemd/systemd/use-nonet-for-docbook.patch b/meta-openembedded/meta-oe/recipes-core/systemd/systemd/use-nonet-for-docbook.patch deleted file mode 100644 index e8aa537..0000000 --- a/meta-openembedded/meta-oe/recipes-core/systemd/systemd/use-nonet-for-docbook.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 - ---- 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-openembedded/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-openembedded/meta-oe/recipes-core/systemd/systemd_git.bb index bafdf9c..7f6751c 100644 --- a/meta-openembedded/meta-oe/recipes-core/systemd/systemd_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/systemd/systemd_git.bb @@ -18,11 +18,10 @@ PR = "r0" inherit autotools vala -SRCREV = "501c92c432c7bef452a2714c29519bdd45281a72" +SRCREV = "85f19d825e7504676f3a80c78c1d9a7ec35a3b3f" SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \ file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \ - file://use-nonet-for-docbook.patch \ ${UCLIBCPATCHES} \ " UCLIBCPATCHES = "" @@ -42,6 +41,11 @@ EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \ --disable-gtk \ " +do_configure_prepend() { + # avoid network access + sed -i -e /nonet/d Makefile.am +} + do_install() { autotools_do_install # provided by a seperate recipe @@ -52,7 +56,7 @@ PACKAGES =+ "${PN}-gui" FILES_${PN}-gui = "${bindir}/systemadm" -FILES_${PN} = " ${base_bindir}/* \ +FILES_${PN} += " ${base_bindir}/* \ ${datadir}/dbus-1/services \ ${datadir}/dbus-1/system-services \ ${datadir}/polkit-1 \ @@ -68,7 +72,8 @@ FILES_${PN} = " ${base_bindir}/* \ ${libdir}/systemd \ " -FILES_${PN}-dbg += "${base_libdir}/systemd/.debug ${base_libdir}/systemd/*/.debug" +FILES_${PN}-dbg += "${base_libdir}/systemd/.debug ${base_libdir}/systemd/*/.debug ${base_libdir}/security/.debug/" +FILES_${PN}-dev += "${base_libdir}/security/*.la" RDEPENDS_${PN} += "dbus-systemd udev-systemd" -- 2.7.4