From 151893aa08dc24de9d97cf9acefd20fe7b57abcc Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 1 Sep 2025 11:01:12 +0200 Subject: [PATCH] package/systemd: select merged-usr from package, not init Since version 255, systemd no longer supports split-usr [0]. Move the select from the init system to the package, to explicitly expose that fact. Drop our comment about our design decision, as it no longer applies. [0] https://github.com/systemd/systemd/blob/v255/NEWS#L7 Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Sen Hastings Acked-by: Arnout Vandecappelle Signed-off-by: Romain Naour --- package/systemd/Config.in | 1 + system/Config.in | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 320d416203..0cb10ea3d8 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -24,6 +24,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_HOST_GCC_AT_LEAST_8 # host-systemd + select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime select BR2_PACKAGE_LIBCAP diff --git a/system/Config.in b/system/Config.in index b24004c533..32462241a5 100644 --- a/system/Config.in +++ b/system/Config.in @@ -115,10 +115,6 @@ comment "openrc needs a glibc or musl toolchain w/ dynamic library" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS && BR2_TOOLCHAIN_USES_UCLIBC -# In Buildroot, we decided not to support a split-usr when systemd is -# used as an init system. This is a design decision, not a systemd -# issue. Thus the select is with BR2_INIT_SYSTEMD (below) rather than -# with BR2_PACKAGE_SYSTEMD. config BR2_INIT_SYSTEMD bool "systemd" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS @@ -130,7 +126,6 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_HOST_GCC_AT_LEAST_8 - select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT