deepcrayon
/
buildroot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

system: Move skeleton-init-* selection to init 

In preparation for supporting br2-external inits, move the 'select' for
the BR2_PACKAGE_SKELETON_INIT_* to their respective init systems. This
will allow a br2-external init to 'select' which skeleton it needs as a
default skeleton.

Signed-off-by: Brandon Maier <brandon.maier@rockwellcollins.com>
[yann.morin.1998@free.fr:
  - add comment to init choice, to remind why selecting skeletons is OK
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020.11.x
Brandon Maier 2020-10-13 17:36:03 -05:00 committed by Yann E. MORIN
parent c71dbcf34a
commit b8f632650a
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
system/Config.in
View File

@ -1,21 +1,17 @@
menu "System configuration"
# Note: usually, it is not possible to select a provider of a virtual
# package. But here we have an exception: there are only four providers
# and they only get selected by separate entries in this choice and
# under different, exclusive conditions. So this is a safe situation.
# Note on package/skeleton: usually, it is not safe to 'select' a
# provider of a virtual package. But below we have an exception: each
# init system may select one of the virtual skeleton-init-* packages.
# As only one init system may be enabled, only one skeleton-init-* may
# be selected. So this is a safe situation.
choice
prompt "Root FS skeleton"
config BR2_ROOTFS_SKELETON_DEFAULT
bool "default target skeleton"
select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_INIT_SYSV
select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_INIT_BUSYBOX
select BR2_PACKAGE_SKELETON_INIT_OPENRC if BR2_INIT_OPENRC
select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_INIT_SYSTEMD
select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_INIT_NONE
help
Use default target skeleton
Use default target skeleton for selected init system.
config BR2_ROOTFS_SKELETON_CUSTOM
bool "custom target skeleton"
@ -86,6 +82,8 @@ config BR2_TARGET_GENERIC_PASSWD_METHOD
default "sha-256" if BR2_TARGET_GENERIC_PASSWD_SHA256
default "sha-512" if BR2_TARGET_GENERIC_PASSWD_SHA512
# See comment at the top of the file, about selecting individual
# skeletons, which are providers of the virtual skeleton package.
choice
prompt "Init system"
default BR2_INIT_BUSYBOX
@ -94,6 +92,7 @@ config BR2_INIT_BUSYBOX
bool "BusyBox"
select BR2_PACKAGE_BUSYBOX
select BR2_PACKAGE_INITSCRIPTS
select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_ROOTFS_SKELETON_DEFAULT
config BR2_INIT_SYSV
bool "systemV"
@ -101,12 +100,14 @@ config BR2_INIT_SYSV
select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # sysvinit
select BR2_PACKAGE_INITSCRIPTS
select BR2_PACKAGE_SYSVINIT
select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_ROOTFS_SKELETON_DEFAULT
config BR2_INIT_OPENRC
bool "OpenRC"
depends on BR2_USE_MMU
depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_OPENRC
select BR2_PACKAGE_SKELETON_INIT_OPENRC if BR2_ROOTFS_SKELETON_DEFAULT
comment "openrc needs a toolchain w/ dynamic library"
depends on BR2_USE_MMU
@ -129,6 +130,7 @@ config BR2_INIT_SYSTEMD
depends on BR2_HOST_GCC_AT_LEAST_5
select BR2_ROOTFS_MERGED_USR
select BR2_PACKAGE_SYSTEMD
select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT
comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5"
depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS
@ -141,6 +143,7 @@ comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and targe
config BR2_INIT_NONE
bool "None"
select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT
help
Buildroot will not install any init system. You will
have to provide your own, either with a new package