diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-08-11 16:02:54 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-08-11 16:02:54 +0200 |
| commit | 150093057baf2904b8fa0d8063c37ff076b38a7e (patch) | |
| tree | 8eef5282715361f8f88c7e56fc1d8f0cb3d3ac3d | |
| parent | 57267e368ada7e262b5f196349898bc707bc7945 (diff) | |
| download | ptxdist-150093057baf2904b8fa0d8063c37ff076b38a7e.tar.gz ptxdist-150093057baf2904b8fa0d8063c37ff076b38a7e.tar.xz | |
systemd: version bump 30 -> 33
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/systemd-33/0001-gperf-add-missing.h-that-was-present-in-the-C-versio.patch | 25 | ||||
| -rw-r--r-- | patches/systemd-33/series | 1 | ||||
| -rw-r--r-- | rules/systemd.in | 1 | ||||
| -rw-r--r-- | rules/systemd.make | 6 |
4 files changed, 31 insertions, 2 deletions
diff --git a/patches/systemd-33/0001-gperf-add-missing.h-that-was-present-in-the-C-versio.patch b/patches/systemd-33/0001-gperf-add-missing.h-that-was-present-in-the-C-versio.patch new file mode 100644 index 000000000..3691cef0d --- /dev/null +++ b/patches/systemd-33/0001-gperf-add-missing.h-that-was-present-in-the-C-versio.patch @@ -0,0 +1,25 @@ +From 612e58b45b84eda7e1f2a82fdfc006f1ae421cb5 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Tue, 2 Aug 2011 07:20:15 +0200 +Subject: [PATCH] gperf: add missing.h that was present in the C version to + the m4 + +This fixes: + +src/load-fragment-gperf.c:413:51: error: 'RLIMIT_RTTIME' undeclared (first use in this function) +--- + src/load-fragment-gperf.gperf.m4 | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/load-fragment-gperf.gperf.m4 b/src/load-fragment-gperf.gperf.m4 +index 650f444..8e52890 100644 +--- a/src/load-fragment-gperf.gperf.m4 ++++ b/src/load-fragment-gperf.gperf.m4 +@@ -2,6 +2,7 @@ + #include <stddef.h> + #include "conf-parser.h" + #include "load-fragment.h" ++#include "missing.h" + %} + struct ConfigPerfItem; + %null_strings diff --git a/patches/systemd-33/series b/patches/systemd-33/series new file mode 100644 index 000000000..5a08985a2 --- /dev/null +++ b/patches/systemd-33/series @@ -0,0 +1 @@ +0001-gperf-add-missing.h-that-was-present-in-the-C-versio.patch diff --git a/rules/systemd.in b/rules/systemd.in index 2ab8564a4..bdbce8f0b 100644 --- a/rules/systemd.in +++ b/rules/systemd.in @@ -3,6 +3,7 @@ menuconfig SYSTEMD tristate select HOST_INTLTOOL + select HOST_GPERF select ROOTFS_RUN select LIBC_PTHREAD select LIBC_RT diff --git a/rules/systemd.make b/rules/systemd.make index 751698ba6..8644da996 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd # # Paths and names # -SYSTEMD_VERSION := 30 -SYSTEMD_MD5 := dafd6d2471e2bf80d35525df9801a40f +SYSTEMD_VERSION := 33 +SYSTEMD_MD5 := 361cad7c3debbdd81c211527509ba181 SYSTEMD := systemd-$(SYSTEMD_VERSION) SYSTEMD_SUFFIX := tar.bz2 SYSTEMD_URL := http://www.freedesktop.org/software/systemd/$(SYSTEMD).$(SYSTEMD_SUFFIX) @@ -95,6 +95,8 @@ $(STATEDIR)/systemd.targetinstall: # # - we don't care about a user systemd yet # # + @$(call install_lib, systemd, 0, 0, 0644, libsystemd-daemon) + # daemon + tools @$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd) @$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemctl) |