diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-06-27 18:37:08 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-27 20:15:37 +0200 |
| commit | 9e3f9dddd2d498a603c0e9eb8bf77d3476a21940 (patch) | |
| tree | e47dfb1985706defb5fafe67b701271cb56efc5e | |
| parent | 5dfd699d809e6cac70a275f8e80133c682b8b90c (diff) | |
| download | meta-openembedded-contrib-9e3f9dddd2d498a603c0e9eb8bf77d3476a21940.tar.gz | |
systemd: bump SRCREV to get the new daemons
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
| -rw-r--r-- | meta-oe/recipes-core/systemd/systemd/0001-systemd-disable-xml-file-stuff-and-introspection.patch | 39 | ||||
| -rw-r--r-- | meta-oe/recipes-core/systemd/systemd_git.bb | 4 |
2 files changed, 31 insertions, 12 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 63310aaecd..d21174da07 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,17 +1,18 @@ -From 4f2c783daa2556666821ad4b3a8825a7b58857b4 Mon Sep 17 00:00:00 2001 +From ef5128ced42e89514c36a6fba837d84f0d8c294d Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> -Date: Mon, 2 May 2011 09:12:21 +0200 +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 | 40 ++-------------------------------------- - 1 files changed, 2 insertions(+), 38 deletions(-) + Makefile.am | 58 ++-------------------------------------------------------- + 1 files changed, 2 insertions(+), 56 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 873090e..49d2ee8 100644 +index bfc1079..f23e060 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -199,21 +199,6 @@ dist_dbussystemservice_DATA = \ +@@ -216,24 +216,6 @@ dist_dbussystemservice_DATA = \ dist_udevrules_DATA = \ src/99-systemd.rules @@ -28,12 +29,15 @@ index 873090e..49d2ee8 100644 - org.freedesktop.systemd1.Automount.xml \ - org.freedesktop.systemd1.Snapshot.xml \ - org.freedesktop.systemd1.Swap.xml \ -- org.freedesktop.systemd1.Path.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 -@@ -642,17 +627,10 @@ XML_FILES = \ +@@ -667,17 +649,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)}}}}} @@ -52,7 +56,7 @@ index 873090e..49d2ee8 100644 systemd_SOURCES = \ src/main.c -@@ -1218,7 +1196,6 @@ CLEANFILES = \ +@@ -1317,7 +1292,6 @@ CLEANFILES = \ $(nodist_systemunit_DATA) \ $(nodist_userunit_DATA) \ $(nodist_man_MANS) \ @@ -60,7 +64,7 @@ index 873090e..49d2ee8 100644 $(pkgconfigdata_DATA) \ src/org.freedesktop.systemd1.policy -@@ -1280,26 +1257,13 @@ man/%.8: man/%.xml +@@ -1379,41 +1353,13 @@ man/%.8: man/%.xml man/%.8.in: man/%.xml.in $(XSLTPROC_PROCESS_MAN_IN) @@ -85,6 +89,21 @@ index 873090e..49d2ee8 100644 - $(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) diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb index 2ce28ac11c..4cc313483f 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 = "readline udev dbus libcap2 libcgroup" +DEPENDS = "acl readline udev dbus libcap2 libcgroup" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SERIAL_CONSOLE ?= "115200 /dev/ttyS0" @@ -19,7 +19,7 @@ PR = "r0" inherit autotools vala -SRCREV = "f9a61ef2c9e3b330d9e2e37977b3dd5758a4b853" +SRCREV = "cd58752a158ccab3db77d355410b31b457df4cfc" SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \ file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \ |