package/systemd: bump version to 246
PATCH 1/2 package/systemd: bump version to 246
Add zstd as optional dependency, and
disable new options for host-systemd.
--- package/systemd/systemd.hash | 4 ++-- package/systemd/systemd.mk | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-)
package/systemd/systemd.hash +2 -2
@@ -1,6 +1,6 @@ # sha256 locally computed -sha256 5770df29a89e8249bb4fbdc2018e2ea7bbb4fd01425cc03ece338f04a1d80c7f systemd-245.7.tar.gz +sha256 4268bd88037806c61c5cd1c78d869f7f20bf7e7368c63916d47b5d1c3411bd6f systemd-246.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 -sha256 f7299f5f5e8bdffd347dce1bed888b1cea6ddaf27de521c307265098bcbeae92 README +sha256 a5ce42cd4614b086ef75aae6663f88f55bdf9e09a83c615c636ca540282528cf README sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 tools/chromiumos/LICENSE
package/systemd/systemd.mk +14 -3
@@ -4,8 +4,8 @@ # ################################################################################ -SYSTEMD_VERSION = 245.7 -SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) +SYSTEMD_VERSION = 246 +SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE SYSTEMD_INSTALL_STAGING = YES
@@ -125,6 +125,13 @@ else SYSTEMD_CONF_OPTS += -Dbzip2=false endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +SYSTEMD_DEPENDENCIES += zstd +SYSTEMD_CONF_OPTS += -Dzstd=true +else +SYSTEMD_CONF_OPTS += -Dzstd=false +endif + ifeq ($(BR2_PACKAGE_LZ4),y) SYSTEMD_DEPENDENCIES += lz4 SYSTEMD_CONF_OPTS += -Dlz4=true
@@ -658,7 +665,11 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dtests=false \ -Dglib=false \ -Dacl=false \ - -Dsysvinit-path='' + -Dsysvinit-path='' \ + -Dinitrd=false \ + -Dxdg-autostart=false \ + -Dkernel-install=false \ + -Dsystemd-analyze=false HOST_SYSTEMD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \
Signature · 1 line
2.27.0
PATCH 2/2 package/systemd: support new v246 options
This adds switches for new options:
initrd: Installs services if systemd is used on an initramfs, useless otherwise
kernel-install: helper scripts to update kernel with an systemd-boot partition
analyze: tool to analyze bootup and dependencies
--- package/systemd/Config.in | 25 +++++++++++++++++++++++++ package/systemd/systemd.mk | 18 ++++++++++++++++++ 2 files changed, 43 insertions(+)
package/systemd/Config.in +25 -0
@@ -112,6 +112,30 @@ config BR2_PACKAGE_SYSTEMD_BOOT https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/ +config BR2_PACKAGE_SYSTEMD_INITRD + bool "Services for booting from initrd" + help + install various services that are only usefull if systemd + is run from an initrd. + +config BR2_PACKAGE_SYSTEMD_KERNELINSTALL + bool "install kernel-install and related files" + help + kernel-install is used to install and remove kernel and + initramfs images to and from the boot loader partition. + The boot loader partition will usually be one of + /boot, /efi, or /boot/efi. + +config BR2_PACKAGE_SYSTEMD_ANALYZE + bool "systemd-analyze" + help + systemd-analyze may be used to determine system boot-up + performance statistics and retrieve other state and tracing + information from the system and service manager, + and to verify the correctness of unit files. + It is also used to access special functions useful for + advanced system manager debugging. + config BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH string default "ia32" if BR2_i386
@@ -187,6 +211,7 @@ config BR2_PACKAGE_SYSTEMD_FIRSTBOOT config BR2_PACKAGE_SYSTEMD_HIBERNATE bool "enable hibernation support" + depends on BR2_PACKAGE_SYSTEMD_INITRD help When this features is enabled, additional tools and services are built to support suspending and resuming the system.
package/systemd/systemd.mk +18 -0
@@ -208,6 +208,24 @@ else SYSTEMD_CONF_OPTS += -Dpcre2=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_INITRD),y) +SYSTEMD_CONF_OPTS += -Dinitrd=true +else +SYSTEMD_CONF_OPTS += -Dinitrd=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_KERNELINSTALL),y) +SYSTEMD_CONF_OPTS += -Dkernel-install=true +else +SYSTEMD_CONF_OPTS += -Dkernel-install=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_ANALYZE),y) +SYSTEMD_CONF_OPTS += -Danalyze=true +else +SYSTEMD_CONF_OPTS += -Danalyze=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y) SYSTEMD_DEPENDENCIES += libmicrohttpd SYSTEMD_CONF_OPTS += -Dmicrohttpd=true
Signature · 1 line
2.27.0
PATCH 2/2 package/systemd: support new v246 options
package/systemd/Config.in config BR2_PACKAGE_SYSTEMD_FIRSTBOOT · line 214
Quoted 3 lines · On Fri, 31 Jul 2020 23:18:46 +0200 Norbert Lange <[email protected]> wrote:
config
BR2_PACKAGE_SYSTEMD_HIBERNATEpackage/systemd/Config.in +1
-0bool "enable hibernation support" + depends on BR2_PACKAGE_SYSTEMD_INITRD
Changed to a "select" to not break backward compatibility and because this dependency is not necessarily obvious.
Applied with this change. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Thomas Petazzoni
AppliedPATCH 1/2 package/systemd: bump version to 246
In reply to Norbert LangeQuoted 8 lines · On Fri, 31 Jul 2020 23:18:45 +0200 Norbert Lange <[email protected]> wrote:
Add zstd as optional dependency, and
disable new options for host-systemd.Signed-off-by Norbert Lange <[email protected]>--- package/systemd/systemd.hash | 4 ++-- package/systemd/systemd.mk | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com