From patchwork Tue Oct 13 22:36:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Maier X-Patchwork-Id: 1381741 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.136; helo=silver.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=z2/wTCfT; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C9r524qQ2z9ryj for ; Wed, 14 Oct 2020 09:36:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3329E2E4C5; Tue, 13 Oct 2020 22:36:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QrqXgWH3hcJE; Tue, 13 Oct 2020 22:36:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A1B8C2E1FB; Tue, 13 Oct 2020 22:36:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 560AD1BF5A5 for ; Tue, 13 Oct 2020 22:36:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 493E52E1F4 for ; Tue, 13 Oct 2020 22:36:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id s1YV6W+mwSRV for ; Tue, 13 Oct 2020 22:36:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from secvs05.rockwellcollins.com (secvs05.rockwellcollins.com [205.175.225.131]) by silver.osuosl.org (Postfix) with ESMTPS id 97FB92E1E1 for ; Tue, 13 Oct 2020 22:36:31 +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:in-reply-to: references:mime-version:content-transfer-encoding; bh=qYrQDVVmKj9VBqPzVyPOD9FTHjoJMIIYTjiI9ZZDLx8=; b=z2/wTCfTpESfnxUdWC7lQI6jL7+sbaqy6iqGOOJmnczy+bOiJrgHy8Ls 8rbZDBQrp9sJyAd95BAizIQXtGwC/R+llcKTVIhjIdapLUXh5zyqlJEzo Uu8egSiFOzywFHAZKUQtFrO6FM2eoRXK/wYUQYgm/0nH5iLt1Q+4akQ2s 83RPwHfD58qnVv73x6xl0mr2BJwsJ5y20eZA4lBgm38rTWF10eNVGAcdS wNcRnofnpKJsn1PnARVcGZ0Wt9ekHuF7UmrHUoDEU0n8iTX3vuMhujxQZ 1B5c/9jfZtAQu68fM4Uf32xzP4yOgGhIoERxosKfxjMd2R7CpkX9mBWol g==; IronPort-SDR: iDKJQS8426mEFhBIPM+IIaP8V+LgkmPwJ5OOcnvMOwpiRtPk3i8yUbi+QUKzlJo70n8RM4IZY8 O+JNnrZrsgasPnzcjGMmI1GvTwEPo+nVMqAUc07VaGYpD9wAUOAdnmc4Z18jjC+36idiDV8Z9p p2MXucr90DGq4FKPzVqCXVCWRVziqPgpe/1fP1ccgoSCokChKwkayu+juMHNt4XA6Vok8IoxHJ kd00FpxMU+P0OLYeYMdoDdEd708A5AzzRwQNGLk4xKbs6uDcAzPf/Q1EiS2kYtOuzWtfL8qqZp DiI= Received: from ofwgwc03.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.225.12]) by secvs05.rockwellcollins.com with ESMTP; 13 Oct 2020 17:36:27 -0500 X-Received: from righttwix.rockwellcollins.com (righttwix.rockwellcollins.com [192.168.141.218]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id D7AB120051; Tue, 13 Oct 2020 17:36:26 -0500 (CDT) From: Brandon Maier To: buildroot@buildroot.org Date: Tue, 13 Oct 2020 17:36:01 -0500 Message-Id: <20201013223605.188920-1-brandon.maier@rockwellcollins.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201013194149.171518-1-brandon.maier@rockwellcollins.com> References: <20201013194149.171518-1-brandon.maier@rockwellcollins.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/5] system: support br2-external skeleton packages 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: thomas.petazzoni@bootlin.com, Brandon Maier , yann.morin.1998@free.fr, Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Today, the BR2_ROOTFS_SKELETON_CUSTOM is the only way to build a custom skeleton. But it's limiting as users must provide a pre-built skeleton for each target. Supporting a br2-external package allows users to build up a skeleton and customize it with their own KConfig options. Signed-off-by: Brandon Maier --- support/scripts/br2-external | 9 +++++++++ system/Config.in | 3 +++ 2 files changed, 12 insertions(+) diff --git a/support/scripts/br2-external b/support/scripts/br2-external index ededd2d900..01804e1220 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -161,6 +161,7 @@ do_kconfig() { toolchains jpeg openssl + skeleton ) for br2 in "${items[@]}"; do @@ -224,6 +225,14 @@ do_kconfig() { else printf '# No openssl from: %s\n\n' "${br2_desc}" fi >>"${outputdir}/.br2-external.in.openssl" + + if [ -f "${br2_ext}/provides/skeleton.in" ]; then + printf 'comment "skeleton from: %s"\n' "${br2_desc}" + printf 'source "%s/provides/skeleton.in"\n' "${br2_ext}" + printf '\n' + else + printf '# No skeleton from: %s\n\n' "${br2_desc}" + fi >>"${outputdir}/.br2-external.in.skeleton" done printf 'endmenu\n' >>"${outputdir}/.br2-external.in.menus" diff --git a/system/Config.in b/system/Config.in index b8b7c16529..a363e099e5 100644 --- a/system/Config.in +++ b/system/Config.in @@ -23,6 +23,9 @@ config BR2_ROOTFS_SKELETON_CUSTOM help Use custom target skeleton. +# skeleton from br2-external trees, if any +source "$BR2_BASE_DIR/.br2-external.in.skeleton" + endchoice if BR2_ROOTFS_SKELETON_CUSTOM