systemd: version bump 216 -> 217

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

6 files changed, 14 insertions, 17 deletions

diff --git a/patches/systemd-216/0001-missing-defined-extra-clock-ids.patch b/patches/systemd-217/0001-missing-defined-extra-clock-ids.patch
index 76e7eb94c..0c9bc194f 100644
--- a/patches/systemd-216/0001-missing-defined-extra-clock-ids.patch
+++ b/patches/systemd-217/0001-missing-defined-extra-clock-ids.patch
@@ -12,10 +12,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 10 insertions(+)
 
 diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 3ff1a2172083..1ba0104c4aab 100644
+index bb4f8f23a8c2..93a6570c76a2 100644
 --- a/src/shared/missing.h
 +++ b/src/shared/missing.h
-@@ -550,6 +550,16 @@ static inline int setns(int fd, int nstype) {
+@@ -480,6 +480,16 @@ static inline int setns(int fd, int nstype) {
  #define IFLA_BRIDGE_MAX (__IFLA_BRIDGE_MAX - 1)
  #endif
  
diff --git a/patches/systemd-216/0002-missing-add-BPF_XOR.patch b/patches/systemd-217/0002-missing-add-BPF_XOR.patch
index 30113789f..b7fa69669 100644
--- a/patches/systemd-216/0002-missing-add-BPF_XOR.patch
+++ b/patches/systemd-217/0002-missing-add-BPF_XOR.patch
@@ -10,14 +10,17 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 4 insertions(+)
 
 diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 1ba0104c4aab..b3f501effaea 100644
+index 93a6570c76a2..44ed669e0027 100644
 --- a/src/shared/missing.h
 +++ b/src/shared/missing.h
-@@ -599,3 +599,7 @@ static inline int setns(int fd, int nstype) {
- #ifndef NET_NAME_RENAMED
- #  define NET_NAME_RENAMED 4
+@@ -538,6 +538,10 @@ static inline int setns(int fd, int nstype) {
+ #  define BPF_XOR 0xa0
  #endif
-+
+ 
 +#ifndef BPF_XOR
 +#  define BPF_XOR 0xa0
 +#endif
++
+ /* Note that LOOPBACK_IFINDEX is currently not exported by the
+  * kernel/glibc, but hardcoded internally by the kernel.  However, as
+  * it is exported to userspace indirectly via rtnetlink and the
diff --git a/patches/systemd-216/series b/patches/systemd-217/series
index 807427bfa..807427bfa 100644
--- a/patches/systemd-216/series
+++ b/patches/systemd-217/series
diff --git a/rules/host-systemd.make b/rules/host-systemd.make
index 889e11fff..bc258f648 100644
--- a/rules/host-systemd.make
+++ b/rules/host-systemd.make
@@ -60,7 +60,6 @@ HOST_SYSTEMD_CONF_OPT	:= \
 	--disable-gnutls \
 	--disable-binfmt \
 	--disable-vconsole \
-	--disable-readahead \
 	--disable-bootchart \
 	--disable-quotacheck \
 	--disable-tmpfiles \
@@ -79,7 +78,6 @@ HOST_SYSTEMD_CONF_OPT	:= \
 	--disable-resolved \
 	--disable-networkd \
 	--disable-efi \
-	--disable-multi-seat-x \
 	--disable-kdbus \
 	--disable-myhostname \
 	--disable-gudev \
diff --git a/rules/systemd.make b/rules/systemd.make
index 7df6535dd..b0f7ce00d 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd
 #
 # Paths and names
 #
-SYSTEMD_VERSION	:= 216
-SYSTEMD_MD5	:= 04fda588a04f549da0f397dce3ae6a39
+SYSTEMD_VERSION	:= 217
+SYSTEMD_MD5	:= e68dbff3cc19f66e341572d9fb2ffa89
 SYSTEMD		:= systemd-$(SYSTEMD_VERSION)
 SYSTEMD_SUFFIX	:= tar.xz
 SYSTEMD_URL	:= http://www.freedesktop.org/software/systemd/$(SYSTEMD).$(SYSTEMD_SUFFIX)
@@ -62,6 +62,7 @@ SYSTEMD_CONF_OPT	:= \
 	--disable-undefined-sanitizer \
 	--disable-python-devel \
 	--disable-dbus \
+	--disable-utmp \
 	--enable-compat-libs \
 	--disable-coverage \
 	--enable-kmod \
@@ -87,7 +88,6 @@ SYSTEMD_CONF_OPT	:= \
 	--disable-libidn \
 	--disable-binfmt \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_VCONSOLE)-vconsole \
-	--enable-readahead \
 	--enable-bootchart \
 	--enable-quotacheck \
 	--enable-tmpfiles \
@@ -107,12 +107,12 @@ SYSTEMD_CONF_OPT	:= \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_NETWORK)-resolved \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_NETWORK)-networkd \
 	--disable-efi \
-	--disable-multi-seat-x \
 	--disable-terminal \
 	--disable-kdbus \
 	--enable-myhostname \
 	--$(call ptx/endis,PTXCONF_UDEV_LIBGUDEV)-gudev \
 	--disable-manpages \
+	--disable-hibernate \
 	--disable-ldconfig \
 	--enable-split-usr \
 	--disable-tests \
@@ -122,7 +122,6 @@ SYSTEMD_CONF_OPT	:= \
 	--with-system-uid-max=999 \
 	--with-system-gid-max=999 \
 	--with-dns-servers= \
-	--with-firmware-path=/lib/firmware \
 	--with-sysvinit-path="" \
 	--with-sysvrcnd-path="" \
 	--with-tty-gid=112 \
@@ -182,7 +181,6 @@ SYSTEMD_HELPER := \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-networkd-wait-online,) \
 	systemd-quotacheck \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED,,systemd-random-seed) \
-	systemd-readahead \
 	systemd-remount-fs \
 	systemd-reply-password \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-resolve-host,) \
@@ -195,7 +193,6 @@ SYSTEMD_HELPER := \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_TIMEDATE,systemd-timedated,) \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_TIMEDATE,systemd-timesyncd,) \
 	systemd-update-done \
-	systemd-update-utmp \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_LOGIND,systemd-user-sessions,) \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_VCONSOLE,systemd-vconsole-setup,)
 
diff --git a/rules/udev.make b/rules/udev.make
index 307e42262..5cadb4a14 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -100,7 +100,6 @@ UDEV_RULES-$(PTXCONF_UDEV_LEGACY) += \
 	42-usb-hid-pm.rules
 
 UDEV_RULES-$(PTXCONF_SYSTEMD) += \
-	50-firmware.rules \
 	60-drm.rules \
 	64-btrfs.rules \
 	80-net-setup-link.rules