systemd: update to v33-3

Adding the docbook deps removes the need for the xml removal patch

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

2 files changed, 5 insertions, 93 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
deleted file mode 100644
index 61e3b0d5d7..0000000000
--- a/meta-oe/recipes-core/systemd/systemd/0001-systemd-disable-xml-file-stuff-and-introspection.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From afc9b136758f0d9b77367dac73a7415ca33ed091 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Mon, 27 Jun 2011 15:44:41 +0200
-Subject: [PATCH] systemd: disable xml file stuff and introspection
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- Makefile.am |   38 ++------------------------------------
- 1 files changed, 2 insertions(+), 36 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 15349a1..37a51aa 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -246,24 +246,6 @@ nodist_udevrules_DATA = \
-         src/73-seat-late.rules \
-         src/99-systemd.rules
- 
--dbusinterface_DATA = \
--       org.freedesktop.systemd1.Manager.xml \
--       org.freedesktop.systemd1.Job.xml \
--       org.freedesktop.systemd1.Unit.xml \
--       org.freedesktop.systemd1.Service.xml \
--       org.freedesktop.systemd1.Socket.xml \
--       org.freedesktop.systemd1.Timer.xml \
--       org.freedesktop.systemd1.Target.xml \
--       org.freedesktop.systemd1.Device.xml \
--       org.freedesktop.systemd1.Mount.xml \
--       org.freedesktop.systemd1.Automount.xml \
--       org.freedesktop.systemd1.Snapshot.xml \
--       org.freedesktop.systemd1.Swap.xml \
--       org.freedesktop.systemd1.Path.xml \
--        org.freedesktop.hostname1.xml \
--        org.freedesktop.locale1.xml \
--        org.freedesktop.timedate1.xml
--
- dist_bashcompletion_DATA = \
-        src/systemctl-bash-completion.sh
- 
-@@ -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)}}}}}
- 
--dist_noinst_DATA = \
--       ${XML_FILES:.xml=.html}
--
--nodist_noinst_DATA = \
--       ${XML_IN_FILES:.xml.in=.html}
--
- EXTRA_DIST += \
-        $(XML_FILES) \
-        $(XML_IN_FILES) \
--       ${nodist_man_MANS:=.in} \
--       ${XML_IN_FILES:.xml.in=.html.in}
-+       ${nodist_man_MANS:=.in}
- 
- systemd_SOURCES = \
-        src/main.c
-@@ -1504,7 +1479,6 @@ CLEANFILES = \
-        $(nodist_systemunit_DATA) \
-        $(nodist_userunit_DATA) \
-        $(nodist_man_MANS) \
--       ${XML_IN_FILES:.xml.in=.html} \
-        $(pkgconfigdata_DATA) \
-        $(pkgconfiglib_DATA) \
-        $(nodist_polkitpolicy_DATA) \
-@@ -1569,17 +1543,9 @@ man/%.8: man/%.xml
- man/%.8.in: man/%.xml.in
-        $(XSLTPROC_PROCESS_MAN_IN)
- 
--man/%.html: man/%.xml
--       $(XSLTPROC_PROCESS_HTML)
--
--man/%.html.in: man/%.xml.in
--       $(XSLTPROC_PROCESS_HTML_IN)
--
- CLEANFILES += \
-        $(dist_man_MANS) \
--       ${nodist_man_MANS:=.in} \
--       ${XML_FILES:.xml=.html} \
--       ${XML_IN_FILES:.xml.in=.html.in}
-+       ${nodist_man_MANS:=.in}
- endif
- 
- DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
--- 
-1.6.6.1
-
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index af4a9ae83c..7a35f79072 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 
-DEPENDS = "acl readline udev dbus libcap libcgroup"
+DEPENDS = "docbook-sgml-dtd-4.1-native gperf-native acl readline udev dbus libcap libcgroup"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
@@ -14,14 +14,13 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r0"
+PR = "r1"
 
 inherit autotools vala
 
-SRCREV = "2030694fecef41b9c0bfa917df79b92afd5cb380"
+SRCREV = "612e58b45b84eda7e1f2a82fdfc006f1ae421cb5"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
-           file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
            ${UCLIBCPATCHES} \
           "
 UCLIBCPATCHES = ""
@@ -92,8 +91,9 @@ RRECOMMENDS_${PN} += "kbd kbd-consolefonts \
 
 # TODO:
 # u-a for runlevel and telinit
+# u-a prerm
 
-pkg_postinst_${PN} () {
+pkg_postinst_systemd () {
 update-alternatives --install ${base_sbindir}/init init ${base_bindir}/systemd 300
 update-alternatives --install ${base_sbindir}/halt halt ${base_bindir}/systemctl 300
 update-alternatives --install ${base_sbindir}/reboot reboot ${base_bindir}/systemctl 300