From 273b634f24ecce9a3d4be3ab4dbd0371f7d26e73 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 29 Nov 2023 08:46:35 +0100 Subject: [PATCH] package/openrc: fix uclibc handling Fix issues spotted by Yann E. Morin in commit ca169d1d0a5df92e6a1f0850e6969cc525849e6f: - BR2_TOOLCHAIN_BUILDROOT_UCLIBC -> BR2_TOOLCHAIN_USES_UCLIBC - Add dependency to openrc package and not only to init system Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openrc/Config.in | 5 +++-- system/Config.in | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/openrc/Config.in b/package/openrc/Config.in index 4691be63a2..adc61d2546 100644 --- a/package/openrc/Config.in +++ b/package/openrc/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_OPENRC bool "openrc" depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_INIT_OPENRC select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod tools select BR2_PACKAGE_KMOD # runtime @@ -23,7 +24,7 @@ config BR2_PACKAGE_OPENRC https://github.com/OpenRC/openrc -comment "openrc needs a toolchain w/ dynamic library" +comment "openrc needs a glibc or musl toolchain w/ dynamic library" depends on BR2_USE_MMU depends on BR2_INIT_OPENRC - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS && BR2_TOOLCHAIN_USES_UCLIBC diff --git a/system/Config.in b/system/Config.in index b90e40e415..33ca69b933 100644 --- a/system/Config.in +++ b/system/Config.in @@ -105,13 +105,13 @@ config BR2_INIT_OPENRC bool "OpenRC" depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_BUILDROOT_UCLIBC + depends on !BR2_TOOLCHAIN_USES_UCLIBC # openrc select BR2_PACKAGE_OPENRC select BR2_PACKAGE_SKELETON_INIT_OPENRC if BR2_ROOTFS_SKELETON_DEFAULT comment "openrc needs a glibc or musl toolchain w/ dynamic library" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS && BR2_TOOLCHAIN_BUILDROOT_UCLIBC + 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