core/systemd to 221-2

core/systemd/PKGBUILD

@@ -8,7 +8,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=221
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam'
@@ -25,7 +25,7 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
         'splash-arch.bmp')
 md5sums=('SKIP'
          '90ea67a7bb237502094914622a39e281'
-         '8516a7bd65157d0115c113118c10c3f3'
+         '976c5511b6493715e381f43f16cdb151'
          'bde43090d4ac0ef048e3eaee8202a407'
          '20ead378f5d6df4b2a3e670301510a7d'
          'ddaef54f68f6c86c6c07835fc668f62a'
@@ -42,6 +42,18 @@ prepare() {
   # https://github.com/systemd/systemd/commit/11b9fb15be96
   git cherry-pick -n 11b9fb15be96
 
+  # core: fix reversed dependency check in unit_check_unneeded
+  # https://github.com/systemd/systemd/commit/084918ba41ac
+  git cherry-pick -n 084918ba41ac
+
+  # rules: remove all power management from udev
+  # https://github.com/systemd/systemd/commit/e2452eef02a8
+  git cherry-pick -n e2452eef02a8
+
+  # logind: fix delayed execution regression
+  # https://github.com/systemd/systemd/commit/418b22b88f79
+  git cherry-pick -n 418b22b88f79
+
   ./autogen.sh
 }
 
@@ -61,6 +73,7 @@ build() {
       --enable-compat-libs \
       --disable-audit \
       --disable-ima \
+      --disable-kdbus \
       --with-sysvinit-path= \
       --with-sysvrcnd-path= \
       --with-ntp-servers="${timeservers[*]}"

core/systemd/initcpio-install-systemd

@@ -102,14 +102,13 @@ build() {
     add_binary /usr/lib/systemd/systemd /init
 
     map add_binary \
+        /usr/bin/systemd-tmpfiles \
         /usr/lib/systemd/systemd-hibernate-resume \
-        /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator \
-        /usr/bin/systemd-tmpfiles
-
-    # generators
-    map add_file \
         /usr/lib/systemd/system-generators/systemd-fstab-generator \
-        /usr/lib/systemd/system-generators/systemd-gpt-auto-generator
+        /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
+        /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
+
+    add_module "kdbus?"
 
     # udev rules and systemd units
     map add_udev_rule "$rules" \