diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index b57088dc4c..26d333b57b 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="systemd" -PKG_VERSION="212" +PKG_VERSION="213" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -51,8 +51,8 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ --disable-ima \ --disable-chkconfig \ --disable-selinux \ + --disable-apparmor \ --disable-xz \ - --disable-tcpwrap \ --disable-pam \ --disable-acl \ --disable-xattr \ @@ -62,6 +62,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ --disable-libcryptsetup \ --disable-qrencode \ --disable-microhttpd \ + --disable-gnutls \ --disable-binfmt \ --disable-vconsole \ --disable-readahead \ @@ -69,25 +70,28 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ --disable-quotacheck \ --enable-tmpfiles \ --disable-randomseed \ - --enable-logind \ --disable-backlight \ + --disable-rfkill \ + --enable-logind \ --disable-machined \ --disable-hostnamed \ --disable-timedated \ + --disable-timesyncd \ --disable-localed \ --disable-coredump \ --disable-polkit \ - --disable-multi-seat-x \ + --disable-resolved \ --disable-networkd \ --disable-efi \ + --disable-multi-seat-x \ --disable-kdbus \ --disable-myhostname \ --enable-gudev \ --disable-manpages \ + --enable-split-usr \ --disable-tests \ --without-python \ --disable-python-devel \ - --enable-split-usr \ --with-firmware-path=/storage/.config/firmware:/lib/firmware \ --with-sysvinit-path= \ --with-sysvrcnd-path= \ diff --git a/packages/sysutils/systemd/patches/systemd-10_nah.-no-ln-relative.patch b/packages/sysutils/systemd/patches/systemd-10_nah.-no-ln-relative.patch index b6b9f9c0a7..e34f84db96 100644 --- a/packages/sysutils/systemd/patches/systemd-10_nah.-no-ln-relative.patch +++ b/packages/sysutils/systemd/patches/systemd-10_nah.-no-ln-relative.patch @@ -1,6 +1,6 @@ -From e5ecdd5f5a72d9ca84d0e080456887f38ad4e3d4 Mon Sep 17 00:00:00 2001 +From 2444e6fe823939dd80b24913a1327218bf37a88c Mon Sep 17 00:00:00 2001 From: Stefan Saraev -Date: Wed, 12 Mar 2014 12:42:06 +0200 +Date: Wed, 28 May 2014 20:53:33 +0300 Subject: [PATCH] nah. no ln --relative It is unclear that systemd now requires very recent coreutils @@ -10,14 +10,15 @@ I will not upgrade my debian wheezy machines to jessie, nor I will switch to fedora for no good reason. We are not going to tell our users to do so just to be able to build OpenELEC. --- - Makefile.am | 21 ++++++--------------- - 1 files changed, 6 insertions(+), 15 deletions(-) + Makefile.am | 21 ++++++--------------- + configure.ac | 2 -- + 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am -index bcf20df..1baf2bc 100644 +index 6ff3489..8a45728 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -207,8 +207,8 @@ define move-to-rootlibdir +@@ -212,8 +212,8 @@ define move-to-rootlibdir if test "$(libdir)" != "$(rootlibdir)"; then \ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \ @@ -28,7 +29,7 @@ index bcf20df..1baf2bc 100644 mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \ fi endef -@@ -267,9 +267,9 @@ install-aliases-hook: +@@ -272,9 +272,9 @@ install-aliases-hook: set -- $(SYSTEM_UNIT_ALIASES) && \ dir=$(systemunitdir) && $(install-aliases) set -- $(USER_UNIT_ALIASES) && \ @@ -40,7 +41,7 @@ index bcf20df..1baf2bc 100644 define install-aliases while [ -n "$$1" ]; do \ -@@ -280,15 +280,6 @@ define install-aliases +@@ -285,15 +285,6 @@ define install-aliases done endef @@ -56,7 +57,7 @@ index bcf20df..1baf2bc 100644 INSTALL_EXEC_HOOKS += \ install-target-wants-hook \ install-directories-hook \ -@@ -1869,7 +1860,7 @@ systemd_dbus1_generator_LDADD = \ +@@ -1908,7 +1899,7 @@ systemd_dbus1_generator_LDADD = \ dbus1-generator-install-hook: $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir) $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator @@ -65,7 +66,7 @@ index bcf20df..1baf2bc 100644 dbus1-generator-uninstall-hook: rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator -@@ -2002,7 +1993,7 @@ systemd_bus_proxyd_LDADD = \ +@@ -2042,7 +2033,7 @@ systemd_bus_proxyd_LDADD = \ bus-proxyd-install-hook: $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir) $(AM_V_RM)rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge @@ -74,6 +75,19 @@ index bcf20df..1baf2bc 100644 bus-proxyd-uninstall-hook: rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge +diff --git a/configure.ac b/configure.ac +index 5133c12..7e3938e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,8 +76,6 @@ AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod], [$PATH:/usr/sbin:/sbin]) + + AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec], [$PATH:/usr/sbin:/sbin]) + +-AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])]) +- + M4_DEFINES= + + # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line -- 1.7.2.5