From bacaa688dc28570ffab8da88365e2d2fdeb17113 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 20 Aug 2014 20:24:27 +0300
Subject: [PATCH] systemd: update to systemd-216

---
 packages/sysutils/systemd/package.mk          | 13 ++++++--
 ..._file_preset_all-doing-stupid-things.patch | 32 +++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 packages/sysutils/systemd/patches/systemd-13_stop-unit_file_preset_all-doing-stupid-things.patch

diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk
index b24735f38f..8ec2515e8b 100644
--- a/packages/sysutils/systemd/package.mk
+++ b/packages/sysutils/systemd/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="systemd"
-PKG_VERSION="215"
+PKG_VERSION="216"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -50,6 +50,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --disable-selinux \
                            --disable-apparmor \
                            --disable-xz \
+                           --disable-lz4 \
                            --disable-pam \
                            --disable-acl \
                            --disable-smack \
@@ -60,6 +61,8 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --disable-qrencode \
                            --disable-microhttpd \
                            --disable-gnutls \
+                           --disable-libcurl \
+                           --disable-libidn \
                            --disable-binfmt \
                            --disable-vconsole \
                            --disable-readahead \
@@ -67,6 +70,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --disable-quotacheck \
                            --enable-tmpfiles \
                            --disable-sysusers \
+                           --disable-firstboot \
                            --disable-randomseed \
                            --disable-backlight \
                            --disable-rfkill \
@@ -82,10 +86,12 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --disable-networkd \
                            --disable-efi \
                            --disable-multi-seat-x \
+                           --disable-terminal \
                            --disable-kdbus \
                            --disable-myhostname \
                            --enable-gudev \
                            --disable-manpages \
+                           --disable-ldconfig \
                            --enable-split-usr \
                            --disable-tests \
                            --without-python \
@@ -187,12 +193,13 @@ post_makeinstall_target() {
   # remove other notused or nonsense stuff (our /etc is ro)
     rm -rf $INSTALL/usr/lib/systemd/system/systemd-update-done.service
     rm -rf $INSTALL/usr/lib/systemd/system/sysinit.target.wants/systemd-update-done.service
-    rm -rf $INSTALL/usr/lib/systemd/system/ldconfig.service
-    rm -rf $INSTALL/usr/lib/systemd/system/sysinit.target.wants/ldconfig.service
     rm -rf $INSTALL/usr/lib/systemd/system/systemd-udev-hwdb-update.service
     rm -rf $INSTALL/usr/lib/systemd/system/sysinit.target.wants/systemd-udev-hwdb-update.service
     rm -rf $INSTALL/usr/lib/tmpfiles.d/etc.conf
 
+  # systemd-journal-remote is optional
+    rm -rf $INSTALL/usr/lib/tmpfiles.d/systemd-remote.conf
+
   # remove rootfs fsck
     rm -rf $INSTALL/usr/lib/systemd/system/systemd-fsck-root.service
     rm -rf $INSTALL/usr/lib/systemd/system/local-fs.target.wants/systemd-fsck-root.service
diff --git a/packages/sysutils/systemd/patches/systemd-13_stop-unit_file_preset_all-doing-stupid-things.patch b/packages/sysutils/systemd/patches/systemd-13_stop-unit_file_preset_all-doing-stupid-things.patch
new file mode 100644
index 0000000000..14253cc5a8
--- /dev/null
+++ b/packages/sysutils/systemd/patches/systemd-13_stop-unit_file_preset_all-doing-stupid-things.patch
@@ -0,0 +1,32 @@
+From e55ae923fb9d6718ab6db2f7566b9ef4b99ffbd1 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Wed, 20 Aug 2014 20:17:03 +0300
+Subject: [PATCH] stop unit_file_preset_all doing stupid things
+
+populating shitload of useless symlinks into /storage/.config/system.d
+is not so-nice fuckery. and systemctl preset-all is useless on an
+embedded distro like openelec anyway.
+---
+ src/shared/install.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/src/shared/install.c b/src/shared/install.c
+index 03c7a9d..2044042 100644
+--- a/src/shared/install.c
++++ b/src/shared/install.c
+@@ -1927,6 +1927,12 @@ int unit_file_preset_all(
+                 UnitFileChange **changes,
+                 unsigned *n_changes) {
+ 
++
++        // meh systemctl preset-all.
++        // I DONT WANT shitload of symlink populated
++        // just because systemd "thinks" (o_O) /etc is empty
++        return 0;
++
+         _cleanup_install_context_done_ InstallContext plus = {}, minus = {};
+         _cleanup_lookup_paths_free_ LookupPaths paths = {};
+         _cleanup_free_ char *config_path = NULL;
+-- 
+1.7.2.5
+