diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-11-21 14:00:26 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-11-21 14:51:12 +0100 |
| commit | be876e6869df8b9412e0d21321c17340c59243b3 (patch) | |
| tree | 355ac41d2c82fc4b2210970a0d99ffe6d7b9c55c /rules | |
| parent | 8ca0be2eb1f5068d941cc8ab14ee0b49819f327f (diff) | |
| download | ptxdist-be876e6869df8b9412e0d21321c17340c59243b3.tar.gz ptxdist-be876e6869df8b9412e0d21321c17340c59243b3.tar.xz | |
systemd: version bump 216 -> 217
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/host-systemd.make | 2 | ||||
| -rw-r--r-- | rules/systemd.make | 11 | ||||
| -rw-r--r-- | rules/udev.make | 1 |
3 files changed, 4 insertions, 10 deletions
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 |