diff options
Diffstat (limited to 'package/systemd')
| -rw-r--r-- | package/systemd/Config.in | 52 | ||||
| -rw-r--r-- | package/systemd/systemd.hash | 2 | ||||
| -rw-r--r-- | package/systemd/systemd.mk | 71 |
3 files changed, 107 insertions, 18 deletions
diff --git a/package/systemd/Config.in b/package/systemd/Config.in index f7fc3bbfde..97d48c4124 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -56,6 +56,11 @@ config BR2_PACKAGE_SYSTEMD The selection of other packages will enable some features: - acl package will add support for multi-seat. + - xz and/or l4 packages will add compression support in + journal and coredump. + - libcurl package will add support for systemd-journal-upload. + - libgcrypt package will add support for journal sealing and + DNSSEC verification in resolved. http://freedesktop.org/wiki/Software/systemd @@ -64,14 +69,6 @@ if BR2_PACKAGE_SYSTEMD config BR2_PACKAGE_PROVIDES_UDEV default "systemd" -config BR2_PACKAGE_SYSTEMD_ALL_EXTRAS - bool "enable all extras" - select BR2_PACKAGE_XZ - select BR2_PACKAGE_LIBGCRYPT - help - Enable extra features for Systemd: journal compression and - signing. - config BR2_PACKAGE_SYSTEMD_KDBUS bool "enable kdbus support" help @@ -87,6 +84,42 @@ config BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY http://www.freedesktop.org/software/systemd/man/systemd-journal-gatewayd.service.html +config BR2_PACKAGE_SYSTEMD_BINFMT + bool "enable binfmt tool" + help + systemd-binfmt is an early boot service that registers + additional binary formats for executables in the kernel. + + http://www.freedesktop.org/software/systemd/man/systemd-binfmt.service.html + +config BR2_PACKAGE_SYSTEMD_VCONSOLE + bool "enable vconsole tool" + help + systemd-vconsole-setup is an early boot service that + configures the virtual console font and console keymap. + + http://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html + +config BR2_PACKAGE_SYSTEMD_BOOTCHART + bool "enable bootchart tool" + help + systemd-bootchart is a tool, usually run at system startup, + that collects the CPU load, disk load, memory usage, as well + as per-process information from a running system. Collected + results are output as an SVG graph. + + http://www.freedesktop.org/software/systemd/man/systemd-bootchart.html + +config BR2_PACKAGE_SYSTEMD_QUOTACHECK + bool "enable quotacheck tools" + help + systemd-quotacheck is a service responsible for file system + quota checks. It is run once at boot after all necessary + file systems are mounted. It is pulled in only if at least + one file system has quotas enabled. + + http://www.freedesktop.org/software/systemd/man/systemd-quotacheck.service.html + config BR2_PACKAGE_SYSTEMD_NETWORKD bool "enable network manager" help @@ -101,10 +134,9 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD config BR2_PACKAGE_SYSTEMD_TIMESYNCD bool "enable SNTP client" - depends on BR2_PACKAGE_SYSTEMD_NETWORKD help systemd-timesyncd is a service that may be used to synchronize the - local system clock with a Network Time Protocol Server. + local system clock with a Network Time Protocol server. This simple NTP solution is an alternative to sntp/ntpd from the ntp package. diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 8090200043..729598608d 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 dd124ff561a07e6439ed2b3713f38ca914df7747f110ce86deea17b56d245ae6 systemd-228.tar.gz +sha256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 systemd-229.tar.gz diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 05121cf0c6..79e657e5f3 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 228 +SYSTEMD_VERSION = 229 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = LGPLv2.1+, GPLv2+ (udev), Public Domain (few source files, see README) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README @@ -76,24 +76,81 @@ else SYSTEMD_CONF_OPTS += --disable-kdbus endif -ifeq ($(BR2_PACKAGE_SYSTEMD_ALL_EXTRAS),y) -SYSTEMD_DEPENDENCIES += xz libgcrypt +ifeq ($(BR2_PACKAGE_BZIP2),y) +SYSTEMD_DEPENDENCIES += bzip2 +SYSTEMD_CONF_OPTS += --enable-bzip2 +else +SYSTEMD_CONF_OPTS += --disable-bzip2 +endif + +ifeq ($(BR2_PACKAGE_LZ4),y) +SYSTEMD_DEPENDENCIES += lz4 +SYSTEMD_CONF_OPTS += --enable-lz4 +else +SYSTEMD_CONF_OPTS += --disable-lz4 +endif + +ifeq ($(BR2_PACKAGE_XZ),y) +SYSTEMD_DEPENDENCIES += xz +SYSTEMD_CONF_OPTS += --enable-xz +else +SYSTEMD_CONF_OPTS += --disable-xz +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +SYSTEMD_DEPENDENCIES += zlib +SYSTEMD_CONF_OPTS += --enable-zlib +else +SYSTEMD_CONF_OPTS += --disable-zlib +endif + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +SYSTEMD_DEPENDENCIES += libcurl +SYSTEMD_CONF_OPTS += --enable-libcurl +else +SYSTEMD_CONF_OPTS += --disable-libcurl +endif + +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +SYSTEMD_DEPENDENCIES += libgcrypt SYSTEMD_CONF_OPTS += \ - --enable-xz \ --enable-gcrypt \ --with-libgcrypt-prefix=$(STAGING_DIR)/usr else -SYSTEMD_CONF_OPTS += \ - --disable-xz \ - --disable-gcrypt +SYSTEMD_CONF_OPTS += --disable-gcrypt endif ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y) SYSTEMD_DEPENDENCIES += libmicrohttpd +SYSTEMD_CONF_OPTS += --enable-microhttpd else SYSTEMD_CONF_OPTS += --disable-microhttpd endif +ifeq ($(BR2_PACKAGE_SYSTEMD_BINFMT),y) +SYSTEMD_CONF_OPTS += --enable-binfmt +else +SYSTEMD_CONF_OPTS += --disable-binfmt +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_VCONSOLE),y) +SYSTEMD_CONF_OPTS += --enable-vconsole +else +SYSTEMD_CONF_OPTS += --disable-vconsole +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_BOOTCHART),y) +SYSTEMD_CONF_OPTS += --enable-bootchart +else +SYSTEMD_CONF_OPTS += --disable-bootchart +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_QUOTACHECK),y) +SYSTEMD_CONF_OPTS += --enable-quotacheck +else +SYSTEMD_CONF_OPTS += --disable-quotacheck +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += --enable-networkd define SYSTEMD_INSTALL_RESOLVCONF_HOOK |
