NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/openrc: fix uclibc handling

Browse Source 
Fix issues spotted by Yann E. Morin in commit
ca169d1d0a:
 - 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>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2023-11-29 08:46:35 +01:00 committed by Peter Korsgaard
parent e88823d667
commit 273b634f24
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/openrc/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_OPENRC
bool "openrc" bool "openrc"
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
depends on !BR2_TOOLCHAIN_USES_UCLIBC
depends on BR2_INIT_OPENRC depends on BR2_INIT_OPENRC
select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod tools select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod tools
select BR2_PACKAGE_KMOD # runtime select BR2_PACKAGE_KMOD # runtime
@ -23,7 +24,7 @@ config BR2_PACKAGE_OPENRC
https://github.com/OpenRC/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_USE_MMU
depends on BR2_INIT_OPENRC depends on BR2_INIT_OPENRC
depends on BR2_STATIC_LIBS depends on BR2_STATIC_LIBS && BR2_TOOLCHAIN_USES_UCLIBC

4
system/Config.in
View File

@ -105,13 +105,13 @@ config BR2_INIT_OPENRC
bool "OpenRC" bool "OpenRC"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_STATIC_LIBS 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_OPENRC
select BR2_PACKAGE_SKELETON_INIT_OPENRC if BR2_ROOTFS_SKELETON_DEFAULT select BR2_PACKAGE_SKELETON_INIT_OPENRC if BR2_ROOTFS_SKELETON_DEFAULT
comment "openrc needs a glibc or musl toolchain w/ dynamic library" comment "openrc needs a glibc or musl toolchain w/ dynamic library"
depends on BR2_USE_MMU 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 # 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 # used as an init system. This is a design decision, not a systemd