diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-05-20 12:18:59 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-05-20 19:40:29 +0200 |
commit | 80f93b22fa5eac7e96489d81910566219da29f8b (patch) | |
tree | b8b09b9e53d7beb79fabd9c633633027328ce761 | |
parent | 750182d3d4e997cdca24fc8532863ea6b71051b8 (diff) | |
download | ptxdist-80f93b22fa5eac7e96489d81910566219da29f8b.tar.gz ptxdist-80f93b22fa5eac7e96489d81910566219da29f8b.tar.xz |
systemd: version bump 26 -> 27
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/systemd-26/0001-create-dbussystemservicedir.patch | 31 | ||||
-rw-r--r-- | patches/systemd-26/0002-dbus-fix-system-handling.patch | 33 | ||||
-rw-r--r-- | patches/systemd-26/0003-user-sessions-don-t-report-errors-unless-etc-run-nol.patch | 36 | ||||
l--------- | patches/systemd-26/autogen.sh | 1 | ||||
-rw-r--r-- | patches/systemd-26/series | 5 | ||||
-rw-r--r-- | rules/systemd.make | 4 |
6 files changed, 2 insertions, 108 deletions
diff --git a/patches/systemd-26/0001-create-dbussystemservicedir.patch b/patches/systemd-26/0001-create-dbussystemservicedir.patch deleted file mode 100644 index 162abf355..000000000 --- a/patches/systemd-26/0001-create-dbussystemservicedir.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 2 Apr 2011 16:43:33 +0200 -Subject: [PATCH] create dbussystemservicedir - -otherwise building fails if it doesn't exist: - -( cd <DESTDIR>/usr/share/dbus-1/services && \ - rm -f org.freedesktop.systemd1.service && \ - ln -s ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) -/bin/sh: line 0: cd: <DESTDIR>/usr/share/dbus-1/services: No such file or directory - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 873090e..e4cf1f5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1340,6 +1340,7 @@ endif - $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \ - $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \ - $(DESTDIR)$(pkgsysconfdir)/user \ -+ $(DESTDIR)$(dbussessionservicedir) \ - $(DESTDIR)$(sysconfdir)/xdg/systemd - ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \ - rm -f user && \ --- -1.7.4.1 - diff --git a/patches/systemd-26/0002-dbus-fix-system-handling.patch b/patches/systemd-26/0002-dbus-fix-system-handling.patch deleted file mode 100644 index 4c9e50143..000000000 --- a/patches/systemd-26/0002-dbus-fix-system-handling.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Robert Schwebel <r.schwebel@pengutronix.de> -Date: Thu, 14 Oct 2010 17:53:07 +0200 -Subject: [PATCH] dbus: fix --system handling - -We currently only create the private D-Bus server when pid == 1, but -this has also to be done if the user started us with --system. -Otherwhise we get this error: - - systemd-cgroups-agent[164]: Failed to get D-Bus connection: - Failed to connect to socket /org/freedesktop/systemd1/private: Connection refused - -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - src/dbus.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/dbus.c b/src/dbus.c -index 187ed30..67ac33c 100644 ---- a/src/dbus.c -+++ b/src/dbus.c -@@ -957,7 +957,7 @@ static int bus_init_private(Manager *m) { - return 0; - - /* We want the private bus only when running as init */ -- if (getpid() != 1) -+ if (m->running_as != MANAGER_SYSTEM) - return 0; - - unlink("/run/systemd/private"); --- -1.7.4.1 - diff --git a/patches/systemd-26/0003-user-sessions-don-t-report-errors-unless-etc-run-nol.patch b/patches/systemd-26/0003-user-sessions-don-t-report-errors-unless-etc-run-nol.patch deleted file mode 100644 index e411210c7..000000000 --- a/patches/systemd-26/0003-user-sessions-don-t-report-errors-unless-etc-run-nol.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Tue, 3 May 2011 19:11:36 +0200 -Subject: [PATCH] user-sessions: don't report errors unless /{etc,run}/nologin exists and cannot be removed - -on a read-only file-system 'unlink' returns EROFS (Read-only file -system) even if the file does not exists. - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - src/user-sessions.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/user-sessions.c b/src/user-sessions.c -index 4518d95..c48b6c1 100644 ---- a/src/user-sessions.c -+++ b/src/user-sessions.c -@@ -41,13 +41,14 @@ int main(int argc, char*argv[]) { - - if (streq(argv[1], "start")) { - int q = 0, r = 0; -+ struct stat buffer; - -- if (unlink("/run/nologin") < 0 && errno != ENOENT) { -+ if (stat("/run/nologin", &buffer) == 0 && unlink("/run/nologin") < 0 && errno != ENOENT) { - log_error("Failed to remove /run/nologin file: %m"); - r = -errno; - } - -- if (unlink("/etc/nologin") < 0 && errno != ENOENT) { -+ if (stat("/etc/nologin", &buffer) == 0 && unlink("/etc/nologin") < 0 && errno != ENOENT) { - log_error("Failed to remove /etc/nologin file: %m"); - q = -errno; - } --- -1.7.4.1 - diff --git a/patches/systemd-26/autogen.sh b/patches/systemd-26/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/systemd-26/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh
\ No newline at end of file diff --git a/patches/systemd-26/series b/patches/systemd-26/series deleted file mode 100644 index 54f1b68af..000000000 --- a/patches/systemd-26/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -0001-create-dbussystemservicedir.patch -0002-dbus-fix-system-handling.patch -0003-user-sessions-don-t-report-errors-unless-etc-run-nol.patch -# e71a8c0a70a2e2a7cdb0d47d6a7f6d46 - git-ptx-patches magic diff --git a/rules/systemd.make b/rules/systemd.make index 1dd2d4192..5b4a6efe5 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd # # Paths and names # -SYSTEMD_VERSION := 26 -SYSTEMD_MD5 := b7c468aa400c64d02d533eba6359e283 +SYSTEMD_VERSION := 27 +SYSTEMD_MD5 := 6d6319e1817960459f13b300c4881f18 SYSTEMD := systemd-$(SYSTEMD_VERSION) SYSTEMD_SUFFIX := tar.bz2 SYSTEMD_URL := http://www.freedesktop.org/software/systemd/$(SYSTEMD).$(SYSTEMD_SUFFIX) |