diff options
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/host-systemd.make | 5 | ||||
| -rw-r--r-- | rules/systemd.make | 15 |
2 files changed, 9 insertions, 11 deletions
diff --git a/rules/host-systemd.make b/rules/host-systemd.make index 547b3c853..835cc59b4 100644 --- a/rules/host-systemd.make +++ b/rules/host-systemd.make @@ -38,7 +38,6 @@ HOST_SYSTEMD_CONF_OPT := \ --disable-undefined-sanitizer \ --disable-dbus \ --disable-utmp \ - --disable-compat-libs \ --disable-coverage \ --disable-kmod \ --disable-xkbcommon \ @@ -47,6 +46,8 @@ HOST_SYSTEMD_CONF_OPT := \ --disable-ima \ --disable-selinux \ --disable-apparmor \ + --disable-adm-group \ + --disable-wheel-group \ --disable-xz \ --disable-zlib \ --disable-bzip2 \ @@ -65,7 +66,6 @@ HOST_SYSTEMD_CONF_OPT := \ --disable-libiptc \ --disable-binfmt \ --disable-vconsole \ - --disable-bootchart \ --disable-quotacheck \ --disable-tmpfiles \ --disable-sysusers \ @@ -86,6 +86,7 @@ HOST_SYSTEMD_CONF_OPT := \ --disable-networkd \ --disable-efi \ --disable-gnuefi \ + --disable-tpm \ --disable-kdbus \ --disable-myhostname \ --enable-hwdb \ diff --git a/rules/systemd.make b/rules/systemd.make index 71c633a8d..29ddbd84f 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd # # Paths and names # -SYSTEMD_VERSION := 229 -SYSTEMD_MD5 := 5d696f65381b2608da70544df07c2b3c +SYSTEMD_VERSION := 230 +SYSTEMD_MD5 := f2f10a6f100c38582b4f02d60210227d SYSTEMD := systemd-$(SYSTEMD_VERSION) SYSTEMD_SUFFIX := tar.gz SYSTEMD_URL := https://github.com/systemd/systemd/archive/v$(SYSTEMD_VERSION).$(SYSTEMD_SUFFIX) @@ -68,7 +68,6 @@ SYSTEMD_CONF_OPT := \ --disable-undefined-sanitizer \ --disable-dbus \ --disable-utmp \ - --enable-compat-libs \ --disable-coverage \ --enable-kmod \ --disable-xkbcommon \ @@ -77,6 +76,8 @@ SYSTEMD_CONF_OPT := \ --disable-ima \ $(GLOBAL_SELINUX_OPTION) \ --disable-apparmor \ + --enable-adm-group \ + --disable-wheel-group \ --$(call ptx/endis,PTXCONF_SYSTEMD_XZ)-xz \ --disable-zlib \ --disable-bzip2 \ @@ -95,7 +96,6 @@ SYSTEMD_CONF_OPT := \ --$(call ptx/endis,PTXCONF_SYSTEMD_IPMASQUERADE)-libiptc \ --disable-binfmt \ --$(call ptx/endis,PTXCONF_SYSTEMD_VCONSOLE)-vconsole \ - --enable-bootchart \ --enable-quotacheck \ --enable-tmpfiles \ --disable-sysusers \ @@ -116,6 +116,7 @@ SYSTEMD_CONF_OPT := \ --$(call ptx/endis,PTXCONF_SYSTEMD_NETWORK)-networkd \ --enable-efi \ --disable-gnuefi \ + --disable-tpm \ --enable-kdbus \ --enable-myhostname \ --$(call ptx/endis,PTXCONF_UDEV_HWDB)-hwdb \ @@ -174,9 +175,6 @@ endif SYSTEMD_HELPER := \ systemd \ systemd-ac-power \ - systemd-activate \ - systemd-bootchart \ - systemd-bus-proxyd \ systemd-cgroups-agent \ $(call ptx/ifdef, PTXCONF_SYSTEMD_COREDUMP,systemd-coredump,) \ systemd-fsck \ @@ -250,6 +248,7 @@ endif @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-delta) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-path) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-run) + @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-socket-activate) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-stdio-bridge) ifdef PTXCONF_SYSTEMD_TIMEDATE @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/timedatectl) @@ -272,8 +271,6 @@ endif @$(call install_alternative, systemd, 0, 0, 0644, \ /etc/systemd/system.conf) @$(call install_alternative, systemd, 0, 0, 0644, \ - /etc/systemd/bootchart.conf) - @$(call install_alternative, systemd, 0, 0, 0644, \ /etc/systemd/journald.conf) ifdef PTXCONF_SYSTEMD_LOGIND @$(call install_alternative, systemd, 0, 0, 0644, \ |