From patchwork Tue Oct 13 19:41:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Maier X-Patchwork-Id: 1381701 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=rockwellcollins.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=M++7IeBf; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C9mCV0d5Jz9sVH for ; Wed, 14 Oct 2020 06:42:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BBBA287D67; Tue, 13 Oct 2020 19:42:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RXpASTwBrbDg; Tue, 13 Oct 2020 19:42:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 928A087D5E; Tue, 13 Oct 2020 19:42:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 8AB0D1BF868 for ; Tue, 13 Oct 2020 19:42:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 878EE875D9 for ; Tue, 13 Oct 2020 19:42:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cTjVSK16ATsy for ; Tue, 13 Oct 2020 19:42:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from da1vs03.rockwellcollins.com (da1vs03.rockwellcollins.com [205.175.227.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 971D2874D2 for ; Tue, 13 Oct 2020 19:42:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=m6G+o/b1J79kKtE8FuEoZx99ZyO6Yom+TeBdnb49a/I=; b=M++7IeBfiqwvfCha0BjXQFeOy9Uh90QNrwifGvSTJGewvoQMgI+MOM4/ TSvn1+PCQYNBviDdGi2CVDQ0b00IML+rPzDWeTEIQNFPMrDNz6C4iL6nj wZE6HzPcfOY7uNhnxtWgDLCP0+2s2CNKpnojqJzU0oJg9nOg2byI1id7s X6XkgbdQ5X9IAzbGMslwATPvDPmnjoLWA70TbHcJYRiEJ0rpx4vU6ki4y QTZAFYFg8+tkQ4sKtHGuM7/OfZJ2Y8kxUsmUuug4o0LbY61PhHKokJAje lUAGNFWTPVZhStZPCopzxhqHM4pegGj+QACQz6Y0v54qGsr9nSKkGDZqE w==; IronPort-SDR: EeMzZjwr/nQkAqHquxF3qwz9mL94YUTjg0GeC4OFWj0q1vMDltjP0mjihy01n3k3aD6LuSgivP /n6Y++AehNbaCUK3lbXfQjfb5WQhQRYwaJo80Am8UNCE23M/r/lGFEapCVUUdg1zweeiO7vvRO qq4A+THsj9yAg7pJkElZztVyy49fcYzxV6k5LECUyitclPKyxxg932al0p0ZIlKK2txYWJqRPB VvgxfEkW2eC0KBWJ41y2y4/PxMpGJVXGZlx22vXSqZ0Nbxw+E9AOrFabigqLCboKMmmxsxQg+t Pk4= Received: from ofwda1n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.227.14]) by da1vs03.rockwellcollins.com with ESMTP; 13 Oct 2020 14:42:06 -0500 X-Received: from righttwix.rockwellcollins.com (righttwix.rockwellcollins.com [192.168.141.218]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id 7310420052; Tue, 13 Oct 2020 14:42:05 -0500 (CDT) From: Brandon Maier To: buildroot@buildroot.org Date: Tue, 13 Oct 2020 14:41:48 -0500 Message-Id: <20201013194149.171518-1-brandon.maier@rockwellcollins.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] system: Move skeleton-init-* selection to init X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Brandon Maier , yann.morin.1998@free.fr, thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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. Signed-off-by: Brandon Maier --- system/Config.in | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/system/Config.in b/system/Config.in index b8b7c16529..ec61fac781 100644 --- a/system/Config.in +++ b/system/Config.in @@ -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" @@ -91,6 +87,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" @@ -98,12 +95,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 @@ -126,6 +125,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 @@ -138,6 +138,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