From patchwork Tue Jul 25 21:14:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 793642 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="okyb6Mni"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xH9xf1GQbz9s9Y for ; Wed, 26 Jul 2017 07:15:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1DCC587255; Tue, 25 Jul 2017 21:15:14 +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 eVeuiNVcQXmE; Tue, 25 Jul 2017 21:15:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 395B287238; Tue, 25 Jul 2017 21:15:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DC90A1C2738 for ; Tue, 25 Jul 2017 21:14:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D6E8388237 for ; Tue, 25 Jul 2017 21:14:53 +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 MKBw6pkD8O5c for ; Tue, 25 Jul 2017 21:14:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1748388222 for ; Tue, 25 Jul 2017 21:14:53 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id q189so6490407wmd.0 for ; Tue, 25 Jul 2017 14:14:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=jyYmgRuO9otS6ZFW6YxloYsXb9ovH6UIuWwREQLxclc=; b=okyb6Mnip5e/HiBwXhVkxcxR5ljxNWRsUlGJbBVa3kBGceUMiCHO7i1d6+TQ1E14dm Qh2irjlCv3KQoUqXTCnwrStzji5HBJBJNENqU+8GVXJsOxsswBWm+IhdJzxpT3yxLFuY Xql4Y6nTAtwCwp94149RwJZNXWSfaN9wWYb97+vMA2ifkwqt48ZTvaf6WPcrBY+pM1Ki Quwd6SqTvPWjUtr6mT6ZdvisnMkEpfI/Xg7VH5SLYctGxJ5AY8u2h+USTetosbqw31Jv rpteh99tdsDdp1TxMEWDssmnxbHMJPYY7rvSXv8PYzx7ek/Af19lyWYcx1meHEilY1br MZYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=jyYmgRuO9otS6ZFW6YxloYsXb9ovH6UIuWwREQLxclc=; b=M3bWpAmX/8lLfg7MPIU/hlYPwWTysErApL56YXegY6V6Y/4LfRvY42Z18S1GTV1jcF EwhyF7UoY1V+0IlMpwgZpHOzbGw09sWTWWjWH0+xeOaFZOndZgB0H++IlAzFc7kLMxpj mTCAeadIS9brDYRxLgHPgHD/eXikPyUqXUB64OuIEMzVw9Vpdkls65QcYCbh3h4yqB8p otltBAEnPLNM7rqu6GNG5ih5acT/M5kdMvUuCu5W57/61a6U+yHHNmeN4ogRUMcOQalU TSibJ3YZCgaSM1w4pdN4+gbSm4+Cl9mjfe2/igXmhhEmS7T5PxvJVHMN3bF6WGiTwhsh lqIw== X-Gm-Message-State: AIVw111/uY/19MzFGHUe4HhM3F7561mwEWkyLnrnD2zLfcuNaeurKsN5 h6v8j3Eq0LGYWWI+ X-Received: by 10.28.11.212 with SMTP id 203mr9723470wml.105.1501017291426; Tue, 25 Jul 2017 14:14:51 -0700 (PDT) Received: from localhost.localdomain (2a01cb088610730048780eddbc21d0e7.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:4878:edd:bc21:d0e7]) by smtp.gmail.com with ESMTPSA id g66sm10749897wmc.6.2017.07.25.14.14.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 14:14:50 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Tue, 25 Jul 2017 23:14:31 +0200 Message-Id: <20f52116161fe387fe6d4107abec88491503c96d.1501017251.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 10/14 v4] system: no-init systems may use our default, common skeleton X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Requiring that no-init system indeed provide their own custom skeletons is a bit too-high a burden, especially for quick one-off tests when testing our packages. Allow no-init systems to use our default skeleton, but only use the common part, for the specific sysv or systemd ones are unfit. Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle --- Changes v3 -> v4: - select BR2_PACKAGE_HAS_SKELETON from BR2_PACKAGE_SKELETON_COMMON_ONLY, drop now-unneeded comment (Arnout) --- package/skeleton-common/Config.in | 15 +++++++++++++++ system/Config.in | 5 +---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package/skeleton-common/Config.in b/package/skeleton-common/Config.in index 9abed4292a..fc9d818e37 100644 --- a/package/skeleton-common/Config.in +++ b/package/skeleton-common/Config.in @@ -1,2 +1,17 @@ config BR2_PACKAGE_SKELETON_COMMON bool + +if BR2_PACKAGE_SKELETON_COMMON + +config BR2_PACKAGE_SKELETON_COMMON_ONLY + bool + default y + depends on !BR2_PACKAGE_SKELETON_SYSV + depends on !BR2_PACKAGE_SKELETON_SYSTEMD + depends on !BR2_PACKAGE_SKELETON_CUSTOM + select BR2_PACKAGE_HAS_SKELETON + +config BR2_PACKAGE_PROVIDES_SKELETON + default "skeleton-common" if BR2_PACKAGE_SKELETON_COMMON_ONLY + +endif diff --git a/system/Config.in b/system/Config.in index 65139c0bfd..4d417a93b3 100644 --- a/system/Config.in +++ b/system/Config.in @@ -11,16 +11,13 @@ choice # is most probably unfit; so, allow only the custom skeleton in that case. config BR2_ROOTFS_SKELETON_DEFAULT bool "default target skeleton" - depends on !BR2_INIT_NONE select BR2_PACKAGE_SKELETON_SYSV if BR2_INIT_SYSV select BR2_PACKAGE_SKELETON_SYSV if BR2_INIT_BUSYBOX select BR2_PACKAGE_SKELETON_SYSTEMD if BR2_INIT_SYSTEMD + select BR2_PACKAGE_SKELETON_COMMON if BR2_INIT_NONE help Use default target skeleton -comment "default target skeleton needs an init system" - depends on BR2_INIT_NONE - config BR2_ROOTFS_SKELETON_CUSTOM bool "custom target skeleton" select BR2_PACKAGE_SKELETON_CUSTOM