diff options
| -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 | 9 | ||||
| -rw-r--r-- | rules/systemd.make | 20 |
4 files changed, 20 insertions, 35 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 deleted file mode 100644 index 3691cef0d..000000000 --- a/patches/systemd-33/0001-gperf-add-missing.h-that-was-present-in-the-C-versio.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 5a08985a2..000000000 --- a/patches/systemd-33/series +++ /dev/null @@ -1 +0,0 @@ -0001-gperf-add-missing.h-that-was-present-in-the-C-versio.patch diff --git a/rules/systemd.in b/rules/systemd.in index bdbce8f0b..a0703474e 100644 --- a/rules/systemd.in +++ b/rules/systemd.in @@ -9,11 +9,12 @@ menuconfig SYSTEMD select LIBC_RT select DBUS select LIBCAP - select PYTHON if SYSTEMD_ANALYZE - select DBUS_PYTHON if SYSTEMD_ANALYZE select UDEV select UDEV_LIBUDEV select UDEV_EXPERIMENTAL + select PYTHON if SYSTEMD_ANALYZE + select DBUS_PYTHON if SYSTEMD_ANALYZE + select TCPWRAPPER if SYSTEMD_TCPWRAP prompt "systemd " help systemd is a system and session manager for Linux, compatible with SysV @@ -29,6 +30,10 @@ menuconfig SYSTEMD if SYSTEMD +config SYSTEMD_TCPWRAP + bool + prompt "TCP wrappers support" + config SYSTEMD_DISABLE_RANDOM_SEED bool prompt "disable random seed services" diff --git a/rules/systemd.make b/rules/systemd.make index 1c8921c22..1b9947791 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd # # Paths and names # -SYSTEMD_VERSION := 33 -SYSTEMD_MD5 := 361cad7c3debbdd81c211527509ba181 +SYSTEMD_VERSION := 34 +SYSTEMD_MD5 := 35761c50d5fe8fa8d15a3c651ab8bace SYSTEMD := systemd-$(SYSTEMD_VERSION) SYSTEMD_SUFFIX := tar.bz2 SYSTEMD_URL := http://www.freedesktop.org/software/systemd/$(SYSTEMD).$(SYSTEMD_SUFFIX) @@ -37,10 +37,16 @@ SYSTEMD_CONF_OPT += \ $(CROSS_AUTOCONF_USR) \ --enable-silent-rules \ --disable-selinux \ - --disable-tcpwrap \ + --$(call ptx/endis,PTXCONF_SYSTEMD_TCPWRAP)-tcpwrap \ --disable-pam \ - --disable-gtk \ --disable-acl \ + --disable-audit \ + --disable-libcryptsetup \ + --enable-binfmt \ + --enable-hostnamed \ + --enable-timedated \ + --enable-localed \ + --disable-gtk \ --disable-plymouth \ --with-distro=other \ --without-sysvinit-path \ @@ -55,9 +61,9 @@ SYSTEMD_CONF_OPT += \ # SYSTEMD_MAKEVARS := V=1 -# FIXME kernel: -# - autofs4 is mandatory. Is this necessary? -# - ipv6 is mandatory. Is this necessary? +# FIXME kernel from systemd README: +# - devtmpfs, cgroups are mandatory. +# - autofs4, ipv6 optional but strongly recommended # FIXME busybox tools: # - modprobe fails |