systemd: version bump 220 -> 223

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

18 files changed, 112 insertions, 278 deletions

diff --git a/patches/systemd-220/0005-HACK-missing-add-mor-IFLA_VXLAN_-defines.patch b/patches/systemd-220/0005-HACK-missing-add-mor-IFLA_VXLAN_-defines.patch
deleted file mode 100644
index d898aeb4e..000000000
--- a/patches/systemd-220/0005-HACK-missing-add-mor-IFLA_VXLAN_-defines.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 25 May 2015 21:15:49 +0200
-Subject: [PATCH] HACK: missing: add mor IFLA_VXLAN_* defines
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/shared/missing.h | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 2346b2d46e23..b7c001ffd8d3 100644
---- a/src/shared/missing.h
-+++ b/src/shared/missing.h
-@@ -713,7 +713,7 @@ static inline int setns(int fd, int nstype) {
- #define IFLA_VLAN_MAX   (__IFLA_VLAN_MAX - 1)
- #endif
- 
--#if !HAVE_DECL_IFLA_VXLAN_LOCAL6
-+#if 1
- #define IFLA_VXLAN_UNSPEC 0
- #define IFLA_VXLAN_ID 1
- #define IFLA_VXLAN_GROUP 2
-@@ -732,7 +732,10 @@ static inline int setns(int fd, int nstype) {
- #define IFLA_VXLAN_PORT 15
- #define IFLA_VXLAN_GROUP6 16
- #define IFLA_VXLAN_LOCAL6 17
--#define __IFLA_VXLAN_MAX 18
-+#define IFLA_VXLAN_UDP_CSUM 18
-+#define IFLA_VXLAN_UDP_ZERO_CSUM6_TX 19
-+#define IFLA_VXLAN_UDP_ZERO_CSUM6_RX 20
-+#define __IFLA_VXLAN_MAX 21
- 
- #define IFLA_VXLAN_MAX  (__IFLA_VXLAN_MAX - 1)
- #endif
diff --git a/patches/systemd-220/0006-random-util-guard-including-sys-auxv.h-with-the-corr.patch b/patches/systemd-220/0006-random-util-guard-including-sys-auxv.h-with-the-corr.patch
deleted file mode 100644
index abff14983..000000000
--- a/patches/systemd-220/0006-random-util-guard-including-sys-auxv.h-with-the-corr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 2 Jun 2015 10:41:24 +0200
-Subject: [PATCH] random-util: guard including sys/auxv.h with the
- corresponding ifdef check
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/shared/random-util.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/shared/random-util.c b/src/shared/random-util.c
-index 88f5182508e7..b230044f5099 100644
---- a/src/shared/random-util.c
-+++ b/src/shared/random-util.c
-@@ -23,7 +23,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <time.h>
-+#ifdef HAVE_SYS_AUXV_H
- #include <sys/auxv.h>
-+#endif
- #include <linux/random.h>
- 
- #include "random-util.h"
diff --git a/patches/systemd-220/0007-missing-add-more-btrfs-defines.patch b/patches/systemd-220/0007-missing-add-more-btrfs-defines.patch
deleted file mode 100644
index 02074091f..000000000
--- a/patches/systemd-220/0007-missing-add-more-btrfs-defines.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 2 Jun 2015 10:42:10 +0200
-Subject: [PATCH] missing: add more btrfs defines
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/shared/missing.h | 28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
-
-diff --git a/src/shared/missing.h b/src/shared/missing.h
-index b7c001ffd8d3..02dbb8628a6c 100644
---- a/src/shared/missing.h
-+++ b/src/shared/missing.h
-@@ -269,6 +269,11 @@ struct btrfs_qgroup_inherit {
-         __u64 qgroups[0];
- };
- 
-+struct btrfs_ioctl_qgroup_limit_args {
-+        __u64 qgroupid;
-+        struct btrfs_qgroup_limit lim;
-+};
-+
- struct btrfs_ioctl_vol_args_v2 {
-         __s64 fd;
-         __u64 transid;
-@@ -360,6 +365,14 @@ struct btrfs_ioctl_clone_range_args {
-         __u64 src_offset, src_length;
-         __u64 dest_offset;
- };
-+
-+#define BTRFS_QUOTA_CTL_ENABLE  1
-+#define BTRFS_QUOTA_CTL_DISABLE 2
-+#define BTRFS_QUOTA_CTL_RESCAN__NOTUSED 3
-+struct btrfs_ioctl_quota_ctl_args {
-+        __u64 cmd;
-+        __u64 status;
-+};
- #endif
- 
- #ifndef BTRFS_IOC_DEFRAG
-@@ -367,6 +380,11 @@ struct btrfs_ioctl_clone_range_args {
-                                  struct btrfs_ioctl_vol_args)
- #endif
- 
-+#ifndef BTRFS_IOC_RESIZE
-+#define BTRFS_IOC_RESIZE _IOW(BTRFS_IOCTL_MAGIC, 3, \
-+                                 struct btrfs_ioctl_vol_args)
-+#endif
-+
- #ifndef BTRFS_IOC_CLONE
- #define BTRFS_IOC_CLONE _IOW(BTRFS_IOCTL_MAGIC, 9, int)
- #endif
-@@ -424,6 +442,16 @@ struct btrfs_ioctl_clone_range_args {
-                                  struct btrfs_ioctl_vol_args)
- #endif
- 
-+#ifndef BTRFS_IOC_QUOTA_CTL
-+#define BTRFS_IOC_QUOTA_CTL _IOWR(BTRFS_IOCTL_MAGIC, 40, \
-+                               struct btrfs_ioctl_quota_ctl_args)
-+#endif
-+
-+#ifndef BTRFS_IOC_QGROUP_LIMIT
-+#define BTRFS_IOC_QGROUP_LIMIT _IOR(BTRFS_IOCTL_MAGIC, 43, \
-+                               struct btrfs_ioctl_qgroup_limit_args)
-+#endif
-+
- #ifndef BTRFS_FIRST_FREE_OBJECTID
- #define BTRFS_FIRST_FREE_OBJECTID 256
- #endif
diff --git a/patches/systemd-220/0009-sd-network-ignore-missing-directory-if-networkd-is-d.patch b/patches/systemd-220/0009-sd-network-ignore-missing-directory-if-networkd-is-d.patch
deleted file mode 100644
index 87fda6540..000000000
--- a/patches/systemd-220/0009-sd-network-ignore-missing-directory-if-networkd-is-d.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 3 Jun 2015 17:37:45 +0200
-Subject: [PATCH] sd-network: ignore missing directory if networkd is disabled
-
-sd_network_monitor is used by timesyncd and resolved. Both can be enabled
-while networkd is disabled. /run/systemd/netif/links/ only exists if
-networkd is enabled at build-time, so ignore the corresponding error if it
-is disabled.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/libsystemd/sd-network/sd-network.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
-index db1f6997cbba..861f33b3b574 100644
---- a/src/libsystemd/sd-network/sd-network.c
-+++ b/src/libsystemd/sd-network/sd-network.c
-@@ -310,8 +310,10 @@ _public_ int sd_network_monitor_new(sd_network_monitor **m, const char *category
-         if (!category || streq(category, "links")) {
-                 k = inotify_add_watch(fd, "/run/systemd/netif/links/", IN_MOVED_TO|IN_DELETE);
-                 if (k < 0) {
-+#ifdef ENABLE_NETWORKD
-                         safe_close(fd);
-                         return -errno;
-+#endif
-                 }
- 
-                 good = true;
diff --git a/patches/systemd-220/0010-sd-device-enumerator-fix-matching-on-properties-and-.patch b/patches/systemd-220/0010-sd-device-enumerator-fix-matching-on-properties-and-.patch
deleted file mode 100644
index c874ef3a0..000000000
--- a/patches/systemd-220/0010-sd-device-enumerator-fix-matching-on-properties-and-.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Tom Gundersen <teg@jklm.no>
-Date: Thu, 28 May 2015 17:18:33 +0200
-Subject: [PATCH] sd-device: enumerator - fix matching on properties and
- sysattrs
-
-This was a regression that broke
-
-  $ udevadm trigger -nv --property-match=DEVNAME=/dev/sda1 --attr-match=size=409600
-
-Reported by David Reisner.
-
-(cherry picked from commit 5f529f4c97a141457301477505ae7eb4c28cf610)
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- src/libsystemd/sd-device/device-enumerator.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c
-index ce4862d7f0a3..3692d46e0619 100644
---- a/src/libsystemd/sd-device/device-enumerator.c
-+++ b/src/libsystemd/sd-device/device-enumerator.c
-@@ -367,11 +367,11 @@ static bool match_sysattr(sd_device_enumerator *enumerator, sd_device *device) {
-         assert(enumerator);
-         assert(device);
- 
--        HASHMAP_FOREACH_KEY(sysattr, value, enumerator->nomatch_sysattr, i)
-+        HASHMAP_FOREACH_KEY(value, sysattr, enumerator->nomatch_sysattr, i)
-                 if (match_sysattr_value(device, sysattr, value))
-                         return false;
- 
--        HASHMAP_FOREACH_KEY(sysattr, value, enumerator->match_sysattr, i)
-+        HASHMAP_FOREACH_KEY(value, sysattr, enumerator->match_sysattr, i)
-                 if (!match_sysattr_value(device, sysattr, value))
-                         return false;
- 
-@@ -389,7 +389,7 @@ static bool match_property(sd_device_enumerator *enumerator, sd_device *device)
-         if (hashmap_isempty(enumerator->match_property))
-                 return true;
- 
--        HASHMAP_FOREACH_KEY(property, value, enumerator->match_property, i) {
-+        HASHMAP_FOREACH_KEY(value, property, enumerator->match_property, i) {
-                 const char *property_dev, *value_dev;
- 
-                 FOREACH_DEVICE_PROPERTY(device, property_dev, value_dev) {
diff --git a/patches/systemd-220/series b/patches/systemd-220/series
deleted file mode 100644
index 83314904b..000000000
--- a/patches/systemd-220/series
+++ /dev/null
@@ -1,13 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-missing-defined-extra-clock-ids.patch
-0002-missing-add-BPF_XOR.patch
-0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
-0004-missing-define-__NR_kcmp-if-necessary.patch
-0005-HACK-missing-add-mor-IFLA_VXLAN_-defines.patch
-0006-random-util-guard-including-sys-auxv.h-with-the-corr.patch
-0007-missing-add-more-btrfs-defines.patch
-0008-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
-0009-sd-network-ignore-missing-directory-if-networkd-is-d.patch
-0010-sd-device-enumerator-fix-matching-on-properties-and-.patch
-# db08a6feb9f5f821ab2125c4a3507dbd  - git-ptx-patches magic
diff --git a/patches/systemd-220/0001-missing-defined-extra-clock-ids.patch b/patches/systemd-223/0001-missing-defined-extra-clock-ids.patch
index f6acfae8c..33527037c 100644
--- a/patches/systemd-220/0001-missing-defined-extra-clock-ids.patch
+++ b/patches/systemd-223/0001-missing-defined-extra-clock-ids.patch
@@ -8,14 +8,14 @@ Upstream requires glibc 2.14 but this is useful for host-systemd.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- src/shared/missing.h | 10 ++++++++++
+ src/basic/missing.h | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
-diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 8ca6f8edb62c..db6450a168ca 100644
---- a/src/shared/missing.h
-+++ b/src/shared/missing.h
-@@ -798,6 +798,16 @@ static inline int setns(int fd, int nstype) {
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index ed6cd80c7538..09fe36770e62 100644
+--- a/src/basic/missing.h
++++ b/src/basic/missing.h
+@@ -865,6 +865,16 @@ static inline int setns(int fd, int nstype) {
  #define NDA_MAX (__NDA_MAX - 1)
  #endif
  
diff --git a/patches/systemd-220/0002-missing-add-BPF_XOR.patch b/patches/systemd-223/0002-missing-add-BPF_XOR.patch
index 4b42a3b80..a64cd2823 100644
--- a/patches/systemd-220/0002-missing-add-BPF_XOR.patch
+++ b/patches/systemd-223/0002-missing-add-BPF_XOR.patch
@@ -6,14 +6,14 @@ BPF_XOR was introduced in kernel 3.7
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- src/shared/missing.h | 4 ++++
+ src/basic/missing.h | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/src/shared/missing.h b/src/shared/missing.h
-index db6450a168ca..3568526a54cf 100644
---- a/src/shared/missing.h
-+++ b/src/shared/missing.h
-@@ -860,6 +860,10 @@ static inline int setns(int fd, int nstype) {
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index 09fe36770e62..de9c6f341d11 100644
+--- a/src/basic/missing.h
++++ b/src/basic/missing.h
+@@ -927,6 +927,10 @@ static inline int setns(int fd, int nstype) {
  #  define BPF_XOR 0xa0
  #endif
  
diff --git a/patches/systemd-220/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch b/patches/systemd-223/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
index 6db65fac8..6db65fac8 100644
--- a/patches/systemd-220/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
+++ b/patches/systemd-223/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
diff --git a/patches/systemd-220/0004-missing-define-__NR_kcmp-if-necessary.patch b/patches/systemd-223/0004-missing-define-__NR_kcmp-if-necessary.patch
index bca25ccf2..20b0b173b 100644
--- a/patches/systemd-220/0004-missing-define-__NR_kcmp-if-necessary.patch
+++ b/patches/systemd-223/0004-missing-define-__NR_kcmp-if-necessary.patch
@@ -8,14 +8,14 @@ Not for upstream, but needed for host-systemd.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- src/shared/missing.h | 5 +++++
+ src/basic/missing.h | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 3568526a54cf..2346b2d46e23 100644
---- a/src/shared/missing.h
-+++ b/src/shared/missing.h
-@@ -961,6 +961,11 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index de9c6f341d11..48dfc511266d 100644
+--- a/src/basic/missing.h
++++ b/src/basic/missing.h
+@@ -1028,6 +1028,11 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha
  #define RENAME_NOREPLACE (1 << 0)
  #endif
  
diff --git a/patches/systemd-220/0008-missing-define-O_PATH-and-AT_EMPTY_PATH.patch b/patches/systemd-223/0005-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
index e5bc676bf..881ccf44e 100644
--- a/patches/systemd-220/0008-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
+++ b/patches/systemd-223/0005-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
@@ -8,14 +8,14 @@ Upstream requires glibc 2.16 but this is useful for host-systemd.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- src/shared/missing.h | 6 ++++++
+ src/basic/missing.h | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 02dbb8628a6c..5574386a0628 100644
---- a/src/shared/missing.h
-+++ b/src/shared/missing.h
-@@ -838,6 +838,12 @@ static inline int setns(int fd, int nstype) {
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index 48dfc511266d..98d0d49dade0 100644
+--- a/src/basic/missing.h
++++ b/src/basic/missing.h
+@@ -874,6 +874,12 @@ static inline int setns(int fd, int nstype) {
  #ifndef CLOCK_BOOTTIME_ALARM
  #define CLOCK_BOOTTIME_ALARM 9
  #endif
diff --git a/patches/systemd-223/0006-HACK-configure.ac-don-t-use-AM_PATH_LIBGCRYPT.patch b/patches/systemd-223/0006-HACK-configure.ac-don-t-use-AM_PATH_LIBGCRYPT.patch
new file mode 100644
index 000000000..444c7bafe
--- /dev/null
+++ b/patches/systemd-223/0006-HACK-configure.ac-don-t-use-AM_PATH_LIBGCRYPT.patch
@@ -0,0 +1,59 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 7 Jul 2015 09:58:21 +0200
+Subject: [PATCH] HACK: configure.ac: don't use AM_PATH_LIBGCRYPT
+
+Otherwise autogen.sh fails if libgcrypt/gettext/intltool is not installed.
+
+Note: Upstream rejected patches to make AM_PATH_LIBGCRYPT optional so we
+disable this here with a hack to avoid unnecessary dependencies.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.ac | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index a16ca6396b2c..353afaec7ee6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,6 +54,7 @@ SET_ARCH(IA32, i*86*)
+ SET_ARCH(MIPS, mips*)
+ SET_ARCH(AARCH64, aarch64*)
+ 
++m4_ifdef([AM_NLS__DISABLED], [
+ # i18n stuff for the PolicyKit policy files, heck whether intltool can be found, disable NLS otherwise
+ AC_CHECK_PROG(intltool_found, [intltool-merge], [yes], [no])
+ AS_IF([test x"$intltool_found" != xyes],
+@@ -76,6 +77,12 @@ AS_IF([test -z "$INTLTOOL_POLICY_RULE"], [
+     INTLTOOL_POLICY_RULE='%.policy: %.policy.in ; @echo "  ITMRG   " $@ && echo "*** intltool support required to build target $@" && false'
+     AC_SUBST(INTLTOOL_POLICY_RULE)
+ ])
++],[
++touch `dirname $0`/po/Makefile.in.in
++echo -e 'all:\ninstall:\n' > `dirname $0`/po/Makefile
++INTLTOOL_POLICY_RULE=
++AC_SUBST(INTLTOOL_POLICY_RULE)
++])
+ 
+ GETTEXT_PACKAGE=systemd
+ AC_SUBST(GETTEXT_PACKAGE)
+@@ -673,6 +680,7 @@ fi
+ AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"])
+ 
+ # ------------------------------------------------------------------------------
++m4_ifdef([AM_PATH_LIBGCRYPT__DISABLED], [
+ AC_ARG_ENABLE([gcrypt],
+         AS_HELP_STRING([--disable-gcrypt],[Disable optional GCRYPT support]),
+                 [case "${enableval}" in
+@@ -701,6 +709,11 @@ else
+         GCRYPT_LIBS=
+         GCRYPT_CFLAGS=
+ fi
++],[
++GCRYPT_LIBS=
++GCRYPT_CFLAGS=
++have_gcrypt=no
++])
+ AC_SUBST(GCRYPT_LIBS)
+ AC_SUBST(GCRYPT_CFLAGS)
+ AM_CONDITIONAL([HAVE_GCRYPT], [test "x$have_gcrypt" != xno])
diff --git a/patches/systemd-223/autogen.sh b/patches/systemd-223/autogen.sh
new file mode 100755
index 000000000..cbfab1ee7
--- /dev/null
+++ b/patches/systemd-223/autogen.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+autoreconf \
+	--force \
+	--install \
+	--warnings=cross \
+	--warnings=syntax \
+	--warnings=obsolete \
+	--warnings=unsupported
diff --git a/patches/systemd-223/series b/patches/systemd-223/series
new file mode 100644
index 000000000..3c7ada804
--- /dev/null
+++ b/patches/systemd-223/series
@@ -0,0 +1,9 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-missing-defined-extra-clock-ids.patch
+0002-missing-add-BPF_XOR.patch
+0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
+0004-missing-define-__NR_kcmp-if-necessary.patch
+0005-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
+0006-HACK-configure.ac-don-t-use-AM_PATH_LIBGCRYPT.patch
+# defe636145de2bd40ef12fd72c1c0786  - git-ptx-patches magic
diff --git a/rules/host-systemd.make b/rules/host-systemd.make
index a48019e44..6bdbf69a8 100644
--- a/rules/host-systemd.make
+++ b/rules/host-systemd.make
@@ -29,14 +29,8 @@ HOST_SYSTEMD_CONF_OPT	:= \
 	$(HOST_AUTOCONF) \
 	--enable-silent-rules \
 	--disable-static \
-	--disable-nls \
-	--disable-gtk-doc \
-	--disable-gtk-doc-html \
-	--disable-gtk-doc-pdf \
-	--disable-introspection \
 	--disable-address-sanitizer \
 	--disable-undefined-sanitizer \
-	--disable-python-devel \
 	--disable-dbus \
 	--disable-utmp \
 	--disable-compat-libs \
@@ -46,7 +40,6 @@ HOST_SYSTEMD_CONF_OPT	:= \
 	--disable-blkid \
 	--disable-seccomp \
 	--disable-ima \
-	--disable-chkconfig \
 	--disable-selinux \
 	--disable-apparmor \
 	--disable-xz \
@@ -56,7 +49,6 @@ HOST_SYSTEMD_CONF_OPT	:= \
 	--disable-pam \
 	--disable-acl \
 	--disable-smack \
-	--disable-gcrypt \
 	--disable-audit \
 	--disable-elfutils \
 	--disable-libcryptsetup \
@@ -89,10 +81,8 @@ HOST_SYSTEMD_CONF_OPT	:= \
 	--disable-networkd \
 	--disable-efi \
 	--disable-gnuefi \
-	--disable-terminal \
 	--disable-kdbus \
 	--disable-myhostname \
-	--disable-gudev \
 	--enable-hwdb \
 	--disable-manpages \
 	--disable-hibernate \
@@ -108,11 +98,4 @@ HOST_SYSTEMD_CONF_OPT	:= \
 	--with-rootprefix= \
 	--with-rootlibdir=/lib
 
-$(STATEDIR)/host-systemd.prepare:
-	@$(call targetinfo)
-	@$(call world/prepare, HOST_SYSTEMD)
-#	# needed for broken v220 tarball
-	@$(call compile, HOST_SYSTEMD, clean-generic)
-	@$(call touch)
-
 # vim: syntax=make
diff --git a/rules/systemd.make b/rules/systemd.make
index c741d8145..676d0e05f 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd
 #
 # Paths and names
 #
-SYSTEMD_VERSION	:= 220
-SYSTEMD_MD5	:= 60acd92b04c0f5faa806678abd433014
+SYSTEMD_VERSION	:= 223
+SYSTEMD_MD5	:= fd7b7c622fc2b7deed44f9722227d488
 SYSTEMD		:= systemd-$(SYSTEMD_VERSION)
-SYSTEMD_SUFFIX	:= tar.xz
-SYSTEMD_URL	:= http://www.freedesktop.org/software/systemd/$(SYSTEMD).$(SYSTEMD_SUFFIX)
+SYSTEMD_SUFFIX	:= tar.gz
+SYSTEMD_URL	:= https://github.com/systemd/systemd/archive/v$(SYSTEMD_VERSION).$(SYSTEMD_SUFFIX)
 SYSTEMD_SOURCE	:= $(SRCDIR)/$(SYSTEMD).$(SYSTEMD_SUFFIX)
 SYSTEMD_DIR	:= $(BUILDDIR)/$(SYSTEMD)
 SYSTEMD_LICENSE	:= GPLv2+, LGPLv2.1, MIT
@@ -64,14 +64,8 @@ SYSTEMD_CONF_OPT	:= \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-silent-rules \
 	--disable-static \
-	--disable-nls \
-	--disable-gtk-doc \
-	--disable-gtk-doc-html \
-	--disable-gtk-doc-pdf \
-	--disable-introspection \
 	--disable-address-sanitizer \
 	--disable-undefined-sanitizer \
-	--disable-python-devel \
 	--disable-dbus \
 	--disable-utmp \
 	--enable-compat-libs \
@@ -81,7 +75,6 @@ SYSTEMD_CONF_OPT	:= \
 	--enable-blkid \
 	--disable-seccomp \
 	--disable-ima \
-	--disable-chkconfig \
 	$(GLOBAL_SELINUX_OPTION) \
 	--disable-apparmor \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_XZ)-xz \
@@ -91,7 +84,6 @@ SYSTEMD_CONF_OPT	:= \
 	--disable-pam \
 	--disable-acl \
 	--disable-smack \
-	--disable-gcrypt \
 	--disable-audit \
 	--disable-elfutils \
 	--disable-libcryptsetup \
@@ -122,12 +114,10 @@ SYSTEMD_CONF_OPT	:= \
 	--disable-polkit \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_NETWORK)-resolved \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_NETWORK)-networkd \
-	--disable-efi \
+	--enable-efi \
 	--disable-gnuefi \
-	--disable-terminal \
-	--disable-kdbus \
+	--enable-kdbus \
 	--enable-myhostname \
-	--$(call ptx/endis,PTXCONF_UDEV_LIBGUDEV)-gudev \
 	--$(call ptx/endis,PTXCONF_UDEV_HWDB)-hwdb \
 	--disable-manpages \
 	--disable-hibernate \
@@ -150,13 +140,6 @@ SYSTEMD_CONF_OPT	:= \
 	--with-rootprefix= \
 	--with-rootlibdir=/lib
 
-$(STATEDIR)/systemd.prepare:
-	@$(call targetinfo)
-	@$(call world/prepare, SYSTEMD)
-#	# needed for broken v220 tarball
-	@$(call compile, SYSTEMD, clean-generic)
-	@$(call touch)
-
 # FIXME kernel from systemd README:
 # - devtmpfs, cgroups are mandatory.
 # - autofs4, ipv6  optional but strongly recommended
diff --git a/rules/udev.in b/rules/udev.in
index fc526c4f9..0e237e211 100644
--- a/rules/udev.in
+++ b/rules/udev.in
@@ -176,6 +176,7 @@ menu "misc helper                   "
 
 config UDEV_ACCELEROMETER
 	bool
+	depends on UDEV_LEGACY
 	prompt "accelerometer"
 	help
 	  When an "change" event is received on an accelerometer,
diff --git a/rules/udev.make b/rules/udev.make
index 3fa0cd36b..6e0e6ed3a 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -105,11 +105,11 @@ UDEV_RULES-y := \
 endif
 
 UDEV_RULES-$(PTXCONF_SYSTEMD) += \
+	60-block.rules \
 	60-drm.rules \
 	60-serial.rules \
 	64-btrfs.rules \
 	70-mouse.rules \
-	70-touchpad.rules \
 	80-net-setup-link.rules
 
 UDEV_RULES-$(PTXCONF_SYSTEMD_LOGIND) += \
@@ -118,6 +118,9 @@ UDEV_RULES-$(PTXCONF_SYSTEMD_LOGIND) += \
 	71-seat.rules \
 	73-seat-late.rules
 
+UDEV_RULES-$(PTXCONF_SYSTEMD_VCONSOLE) += \
+	90-vconsole.rules
+
 UDEV_RULES-$(PTXCONF_UDEV_ACCELEROMETER)	+= 61-accelerometer.rules
 ifdef PTXCONF_UDEV_LEGACY
 UDEV_RULES-$(PTXCONF_UDEV_ACL)			+= 70-acl.rules