systemd: update to 230

packages/sysutils/systemd/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="systemd"
-PKG_VERSION="229"
+PKG_VERSION="230"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -41,7 +41,6 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --disable-nls \
                            --disable-dbus \
                            --disable-utmp \
-                           --disable-compat-libs \
                            --disable-coverage \
                            --enable-kmod \
                            --disable-xkbcommon \
@@ -69,7 +68,6 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --disable-libiptc \
                            --disable-binfmt \
                            --disable-vconsole \
-                           --disable-bootchart \
                            --disable-quotacheck \
                            --enable-tmpfiles \
                            --disable-sysusers \
@@ -105,7 +103,6 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --with-dbuspolicydir=/etc/dbus-1/system.d \
                            --with-dbussessionservicedir=/usr/share/dbus-1/services \
                            --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
-                           --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
                            --with-rootprefix=/usr \
                            --with-rootlibdir=/lib"
 
@@ -175,8 +172,9 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/lib/systemd/system-generators
   rm -rf $INSTALL/usr/lib/systemd/catalog
 
-  # meh presets
-  rm -rf $INSTALL/usr/lib/systemd/system-preset
+  # distro preset policy
+  rm -f $INSTALL/usr/lib/systemd/system-preset/*
+  echo "disable *" > $INSTALL/usr/lib/systemd/system-preset/99-default.preset
 
   # remove networkd
   rm -rf $INSTALL/usr/lib/systemd/network

packages/sysutils/systemd/patches/systemd-06_stop-execute_preset-doing-stupid-things.patch

@@ -1,28 +0,0 @@
-From 8cfc723a596bcdab404f4861571b178d76eb1f7a Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Tue, 28 Oct 2014 22:32:18 +0200
-Subject: [PATCH] stop execute_preset 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 | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/shared/install.c b/src/shared/install.c
-index 17e03e5..f7e51af 100644
---- a/src/shared/install.c
-+++ b/src/shared/install.c
-@@ -2165,6 +2165,11 @@ static int execute_preset(
-                 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;
-+
-         int r;
- 
-         assert(plus);

packages/sysutils/systemd/patches/systemd-08_systemctl-disable-dangerous-options.patch

@@ -23,7 +23,7 @@ index 420a246..06bca92 100644
  static void systemctl_help(void) {
  
          pager_open_if_enabled();
-@@ -7370,21 +7370,21 @@
+@@ -7370,22 +7370,22 @@
                  { "enable",                2,        VERB_ANY, 0,             enable_unit       },
                  { "disable",               2,        VERB_ANY, 0,             enable_unit       },
                  { "is-enabled",            2,        VERB_ANY, 0,             unit_is_enabled   },
@@ -39,6 +39,7 @@ index 420a246..06bca92 100644
 +                { "mask",                  2,        VERB_ANY, 0,             nope              },
 +                { "unmask",                2,        VERB_ANY, 0,             nope              },
 +                { "link",                  2,        VERB_ANY, 0,             nope              },
+                 { "revert",                2,        VERB_ANY, 0,             enable_unit       },
                  { "switch-root",           2,        VERB_ANY, VERB_NOCHROOT, switch_root       },
                  { "list-dependencies",     VERB_ANY, 2,        VERB_NOCHROOT, list_dependencies },
 -                { "set-default",           2,        2,        0,             set_default       },

packages/sysutils/systemd/patches/systemd-09_dont_support_btrfs.patch

@@ -1,25 +0,0 @@
-From 0c50b670dc1466ce697a72b34cbb7a1a41d1b24f Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Wed, 18 Nov 2015 20:15:43 +0200
-Subject: [PATCH 8/8] unsupported btrfs bull****
-
----
- src/basic/btrfs-util.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c
-index be40dc5..e5efe4f 100644
---- a/src/basic/btrfs-util.c
-+++ b/src/basic/btrfs-util.c
-@@ -1103,9 +1103,6 @@ int btrfs_quota_scan_start(int fd) {
- int btrfs_quota_scan_wait(int fd) {
-         assert(fd >= 0);
- 
--        if (ioctl(fd, BTRFS_IOC_QUOTA_RESCAN_WAIT) < 0)
--                return -errno;
--
-         return 0;
- }
- 
--- 
-2.1.4