From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@buildroot.org
Cc: "Fabrice Fontaine" <fontaine.fabrice@gmail.com>,
"Michał Łyszczek" <michal.lyszczek@bofc.pl>
Subject: [Buildroot] [PATCH 1/1] package/openrc: fix uclibc handling
Date: Wed, 29 Nov 2023 08:46:35 +0100 [thread overview]
Message-ID: <20231129074635.9797-1-fontaine.fabrice@gmail.com> (raw)
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 <fontaine.fabrice@gmail.com>
---
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
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next reply other threads:[~2023-11-29 7:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-29 7:46 Fabrice Fontaine [this message]
2023-11-29 9:00 ` [Buildroot] [PATCH 1/1] package/openrc: fix uclibc handling Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231129074635.9797-1-fontaine.fabrice@gmail.com \
--to=fontaine.fabrice@gmail.com \
--cc=buildroot@buildroot.org \
--cc=michal.lyszczek@bofc.pl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.