package/systemd: bump to version 251.3
PATCH v3 1/3 package/systemd: bump to version 251.3
LICENSES/README.md hash updated, this line got added in regards to files covered by CC0-1.0:
Quoted 1 line
-config files and examples under /network
Add config option for the new sysupdate feature.
Remove upstreamed patch.
Update options: set new options to their default,
remove option not available anymore.
---v1->v2:
* note about changed LICENSES/README.md * always set default-user-shell to /bin/sh * always set default-locale to C-UTF-8 * fix typos in commit message --- ...define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch | 33 ------------------- package/systemd/Config.in | 12 +++++++ package/systemd/systemd.hash | 4 +-- package/systemd/systemd.mk | 13 ++++++-- 4 files changed, 25 insertions(+), 37 deletions(-) delete mode 100644 package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch
package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 16c132a6a0389e0eaea70c4ad95dbfd1637ec5ba Mon Sep 17 00:00:00 2001 -From: Romain Naour <[email protected]> -Date: Fri, 7 Jan 2022 22:25:23 +0100 -Subject: [PATCH] missing-syscall: define MOVE_MOUNT_T_EMPTY_PATH if missing - -MOVE_MOUNT_T_EMPTY_PATH has been added to systemd 250 by [1] -but it's defined in kernel headers since version 5.2. - -[1] c7bf079bbc19e3b409acc0c7acc3e14749211fe2 - -Signed-off-by: Romain Naour <[email protected]> ---- - src/basic/missing_syscall.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 8267b1a90c..793d111c55 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -569,6 +569,10 @@ static inline int missing_open_tree( - #define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */ - #endif - -+#ifndef MOVE_MOUNT_T_EMPTY_PATH -+#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */ -+#endif -+ - static inline int missing_move_mount( - int from_dfd, - const char *from_pathname, --- -2.31.1 -
package/systemd/Config.in +12 -0
@@ -475,6 +475,18 @@ config BR2_PACKAGE_SYSTEMD_SYSEXT https://www.freedesktop.org/software/systemd/man/systemd-sysext.html +config BR2_PACKAGE_SYSTEMD_SYSUPDATE + bool "enable sysupdate support" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK + help + systemd-sysupdate atomically updates the host OS, container + images, portable service images or other sources, based on + the transfer configuration files described in sysupdate.d. + + https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html + config BR2_PACKAGE_SYSTEMD_SYSUSERS bool "enable sysusers support" help
package/systemd/systemd.hash +2 -2
@@ -1,5 +1,5 @@ # sha256 locally computed -sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz +sha256 11c9c3fcc13d689615dd2ea79161d1b992087cf1e2a23856d7d7ade0efbddc54 systemd-251.3.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt
@@ -11,4 +11,4 @@ sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENS sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt -sha256 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md +sha256 177ff657698bc940f9888b7f69e5d734b0933c2859ea264fde8de1700cec40dd LICENSES/README.md
package/systemd/systemd.mk +11 -2
@@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 250.4 +SYSTEMD_VERSION = 251.3 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \
@@ -62,6 +62,9 @@ SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ -Ddefault-hierarchy=unified \ + -Ddefault-compression=auto \ + -Ddefault-locale='C.UTF-8' \ + -Ddefault-user-shell=/bin/sh \ -Didn=true \ -Dima=false \ -Dkexec-path=/usr/sbin/kexec \
@@ -472,6 +475,12 @@ else SYSTEMD_CONF_OPTS += -Dsysext=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUPDATE),y) +SYSTEMD_CONF_OPTS += -Dsysupdate=true +else +SYSTEMD_CONF_OPTS += -Dsysupdate=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management
@@ -546,7 +555,6 @@ SYSTEMD_DEPENDENCIES += gnu-efi SYSTEMD_CONF_OPTS += \ -Defi=true \ -Dgnu-efi=true \ - -Defi-cc=$(TARGET_CC) \ -Defi-ld=bfd \ -Defi-libdir=$(STAGING_DIR)/usr/lib \ -Defi-includedir=$(STAGING_DIR)/usr/include/efi
@@ -797,6 +805,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dmachined=false \ -Dportabled=false \ -Dsysext=false \ + -Dsysupdate=false \ -Duserdb=false \ -Dhomed=false \ -Dnetworkd=false \
Signature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v3 2/3 package/systemd: allow empty systemd default target
Currently, we forcefully require that a default target be specified. However, systemd does install a default target, but it's not possible to just use that target.
Allow the user to blank-out the config setting to not override whatever systemd installed and keep that.
---v1->v2:
* completely remove the hook if var is empty
* adjusted commit message
v2->v3:
* v2 was broken, dint want to send it. now fixed/correct
--- package/systemd/systemd.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
package/systemd/systemd.mk +4 -1
@@ -578,17 +578,20 @@ ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),) SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME) endif +ifneq ($(call qstrip,$(BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET)),) define SYSTEMD_INSTALL_INIT_HOOK ln -fs "$(call qstrip,$(BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET))" \ $(TARGET_DIR)/usr/lib/systemd/system/default.target endef +SYSTEMD_POST_INSTALL_TARGET_HOOKS += SYSTEMD_INSTALL_INIT_HOOK +endif + define SYSTEMD_INSTALL_MACHINEID_HOOK touch $(TARGET_DIR)/etc/machine-id endef SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ - SYSTEMD_INSTALL_INIT_HOOK \ SYSTEMD_INSTALL_MACHINEID_HOOK define SYSTEMD_INSTALL_IMAGES_CMDS
Signature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v3 3/3 package/systemd: allow package to be used without init system
In reply to Norbert LangeAllow systemd to be built as normal package, this is usefull for repeated rebuilds.
There doesnt seem to be a technical reason to disallow it.
--- package/systemd/Config.in | 1 - 1 file changed, 1 deletion(-)
package/systemd/Config.in +0 -1
@@ -16,7 +16,6 @@ config BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS menuconfig BR2_PACKAGE_SYSTEMD bool "systemd" - depends on BR2_INIT_SYSTEMD depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS # kmod
Signature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 13 lines · Norbert Lange
LICENSES/README.mdhash updated, this line got added in regards to files covered by CC0-1.0:Quoted 1 line
-config files and examples under /network
Add config option for the new sysupdate feature.
Remove upstreamed patch.
Update options: set new options to their default,
remove option not available anymore.
Quoted 8 lines
Signed-off-by Norbert Lange <[email protected]>---
v1->v2:* note about changed LICENSES/README.md * always set default-user-shell to /bin/sh * always set default-locale to C-UTF-8 * fix typos in commit message
You're missing a few things still, take a look at my patch here:
https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/
Make sure you pick up the following changes from my patch:
- dbus config option settings(to prevent dbus from becoming a build
time dependency)
- dnssec changes(so that we pull in new dnssec backends properly)
- kernel headers minimum version bump
Quoted 142 lines
--- ...define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch | 33 ------------------- package/systemd/Config.in | 12 +++++++ package/systemd/systemd.hash | 4 +-- package/systemd/systemd.mk | 13 ++++++-- 4 files changed, 25 insertions(+), 37 deletions(-) delete mode 100644 package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patchpackage/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch deleted +0
-33@@ -1,33 +0,0 @@ -From 16c132a6a0389e0eaea70c4ad95dbfd1637ec5ba Mon Sep 17 00:00:00 2001 -From: Romain Naour <[email protected]> -Date: Fri, 7 Jan 2022 22:25:23 +0100 -Subject: [PATCH] missing-syscall: define MOVE_MOUNT_T_EMPTY_PATH if missing - -MOVE_MOUNT_T_EMPTY_PATH has been added to systemd 250 by [1] -but it's defined in kernel headers since version 5.2. - -[1] c7bf079bbc19e3b409acc0c7acc3e14749211fe2 - -Signed-off-by: Romain Naour <[email protected]> ---- - src/basic/missing_syscall.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 8267b1a90c..793d111c55 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -569,6 +569,10 @@ static inline int missing_open_tree( - #define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */ - #endif - -+#ifndef MOVE_MOUNT_T_EMPTY_PATH -+#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */ -+#endif -+ - static inline int missing_move_mount( - int from_dfd, - const char *from_pathname, --- -2.31.1 -package/systemd/Config.in +12
-0@@ -475,6 +475,18 @@ config BR2_PACKAGE_SYSTEMD_SYSEXT https://www.freedesktop.org/software/systemd/man/systemd-sysext.html +config BR2_PACKAGE_SYSTEMD_SYSUPDATE + bool "enable sysupdate support" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK + help + systemd-sysupdate atomically updates the host OS, container + images, portable service images or other sources, based on + the transfer configuration files described in sysupdate.d. + + https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html + config BR2_PACKAGE_SYSTEMD_SYSUSERS bool "enable sysusers support" helppackage/systemd/systemd.hash +2
-2@@ -1,5 +1,5 @@ # sha256 locally computed -sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz +sha256 11c9c3fcc13d689615dd2ea79161d1b992087cf1e2a23856d7d7ade0efbddc54 systemd-251.3.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt@@ -11,4 +11,4 @@ sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENS sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt -sha256 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md +sha256 177ff657698bc940f9888b7f69e5d734b0933c2859ea264fde8de1700cec40dd LICENSES/README.mdpackage/systemd/systemd.mk +11
-3@@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 250.4 +SYSTEMD_VERSION = 251.3 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \@@ -62,6 +62,9 @@ SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ -Ddefault-hierarchy=unified \ + -Ddefault-compression=auto \ + -Ddefault-locale='C.UTF-8' \ + -Ddefault-user-shell=/bin/sh \ -Didn=true \ -Dima=false \ -Dkexec-path=/usr/sbin/kexec \@@ -472,6 +475,12 @@ else SYSTEMD_CONF_OPTS += -Dsysext=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUPDATE),y) +SYSTEMD_CONF_OPTS += -Dsysupdate=true +else +SYSTEMD_CONF_OPTS += -Dsysupdate=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management@@ -546,7 +555,6 @@ SYSTEMD_DEPENDENCIES += gnu-efi SYSTEMD_CONF_OPTS += \ -Defi=true \ -Dgnu-efi=true \ - -Defi-cc=$(TARGET_CC) \ -Defi-ld=bfd \ -Defi-libdir=$(STAGING_DIR)/usr/lib \ -Defi-includedir=$(STAGING_DIR)/usr/include/efi@@ -797,6 +805,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dmachined=false \ -Dportabled=false \ -Dsysext=false \ + -Dsysupdate=false \ -Duserdb=false \ -Dhomed=false \ -Dnetworkd=false \ --2.35.1
Quoted 4 lines
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Am Do., 21. Juli 2022 um 21:32 Uhr schrieb James Hilliard <[email protected]>:
Quoted 24 lines · Norbert Lange
Quoted 13 lines
LICENSES/README.mdhash updated, this line got added in regards to files covered by CC0-1.0:Quoted 1 line
-config files and examples under /network
Add config option for the new sysupdate feature.
Remove upstreamed patch.
Update options: set new options to their default,
remove option not available anymore.Quoted 8 lines
Signed-off-by Norbert Lange <[email protected]>---
v1->v2:* note about changed LICENSES/README.md * always set default-user-shell to /bin/sh * always set default-locale to C-UTF-8 * fix typos in commit message
Quoted 2 lines
You're missing a few things still, take a look at my patch here:
https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/
Sorry, missed that line before.
Quoted 4 lines
Make sure you pick up the following changes from my patch:
- dbus config option settings(to prevent dbus from becoming a build
time dependency)
Ok.
Quoted 1 line
- dnssec changes(so that we pull in new dnssec backends properly)
I don't understand those options, but I will bake them into lines ~510 following "ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)"
Quoted 1 line
- kernel headers minimum version bump
The minimum it 3.15 (up from 3.13) according to the README, 4.15 is highly recommended.
Probably better to flash a warning in kconfig for now, would make a seperate commit.
Expect a v4 shortly.
Regards, Norbert
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 37 lines · Norbert Lange
Am Do., 21. Juli 2022 um 21:32 Uhr schrieb James Hilliard <[email protected]>:
Quoted 24 lines · Norbert Lange
Quoted 13 lines
LICENSES/README.mdhash updated, this line got added in regards to files covered by CC0-1.0:Quoted 1 line
-config files and examples under /network
Add config option for the new sysupdate feature.
Remove upstreamed patch.
Update options: set new options to their default,
remove option not available anymore.Quoted 8 lines
Signed-off-by Norbert Lange <[email protected]>---
v1->v2:* note about changed LICENSES/README.md * always set default-user-shell to /bin/sh * always set default-locale to C-UTF-8 * fix typos in commit messageQuoted 2 lines
You're missing a few things still, take a look at my patch here:
https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/Sorry, missed that line before.
Quoted 4 lines
Make sure you pick up the following changes from my patch:
- dbus config option settings(to prevent dbus from becoming a build
time dependency)
Quoted 6 lines
Ok.
Quoted 1 line
- dnssec changes(so that we pull in new dnssec backends properly)
I don't understand those options, but I will bake them into lines ~510 following "ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)"
I don't think that will work correctly.
Quoted 11 lines
Quoted 2 lines
- kernel headers minimum version bump
The minimum it 3.15 (up from 3.13) according to the README, 4.15 is highly recommended.
Probably better to flash a warning in kconfig for now, would make a seperate commit.Expect a v4 shortly.
Regards, Norbert
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot