From patchwork Tue Jan 9 11:37:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Kuzmich X-Patchwork-Id: 857406 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="neoBuI5i"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zG9B357l3z9s82 for ; Tue, 9 Jan 2018 22:38:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B22FC30160; Tue, 9 Jan 2018 11:37:58 +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 rGEcyvbLDf-A; Tue, 9 Jan 2018 11:37:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AD7A330155; Tue, 9 Jan 2018 11:37:56 +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 15F681C3F88 for ; Tue, 9 Jan 2018 11:37:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1228E8954C for ; Tue, 9 Jan 2018 11:37:55 +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 e2eFvOOqqcIO for ; Tue, 9 Jan 2018 11:37:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1915189549 for ; Tue, 9 Jan 2018 11:37:54 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id h140so15580316lfg.1 for ; Tue, 09 Jan 2018 03:37:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nbEpNQtxoGo0hRf64NKjyVlyanC41WVhjfQIDh69ckU=; b=neoBuI5ijmQb/xj2kz5Yrljaz1L4l2heEPNdFdi4Ol7GazpBLr+7l1sx950giG3i0X 5QzRM2ehRtbXOwjOzJzFsOy8koChl7Noe55nCe8PJghXGWDDIgLMWm70JomtONh3TnTv uLJ5KOYXy9K1RSvBdqVYNrL/mO2VUlMhuuXJgmUuAYiEHbvJibYVsLIA+G9JfOUliSDY SRfT4hRkSKH0fx9xbIKsT2+iWaTw/FVfbMPByoXTO5LnaHabnf2AUfwKDT+eOFwKMh9g 2vWksRS5giilFYmpVlgNXJRRri2C4nKWtZhmBz70lbWjPnkqgY7gv/XgGfEcoy8KGqm3 XSzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nbEpNQtxoGo0hRf64NKjyVlyanC41WVhjfQIDh69ckU=; b=VHkkBzruqFZ9hEZLh6b89bJXLi709RDYZ0ncuUhUa8REBniQBg5//XY5LN1ppolMTN 4ng5Vekf/vM+TrRphBLnC5tv/rsPuy0eWlYjV50j5GlOrE2Cy4CpqZ+Mtg09jBuE55jI SXZ/S6QH837mQOxslU7Qq429N6ouryiQnQCQTTgz8VNYYGJsZOwi09wurE3K5QRjP7Z3 E0c9AtWyFJqMOOgkUrX8YcPzAj0QO61FBiHE5nMovoiXsfl6OElm/e9ZdpNU5Ffhdyjo wSEN5OQHDnwPmf/EZmDBcGLq7jioiqV5ZsYTDy2B3Kd7BDWml8W7QDq0UuvxwPODxQgz B+Xg== X-Gm-Message-State: AKwxytcf8fZg8cMLQI25hSDtyc4jVwVyLaBq4ESElzlpGX4Q0OJl7nrG H1pjk9aXMuPRVrN/MYa+ssFKLA== X-Google-Smtp-Source: ACJfBovkCDEYOxsdyT4cRL30CBu+x/Wo5zaGtZCrHnMJ/AQKADskk2uOdfjzUIUmBEDaXYrfoy60Rw== X-Received: by 10.25.150.207 with SMTP id y198mr7906364lfd.33.1515497872115; Tue, 09 Jan 2018 03:37:52 -0800 (PST) Received: from localhost (194-24-241-59.westcall.net. [194.24.241.59]) by smtp.gmail.com with ESMTPSA id i1sm2781509lji.22.2018.01.09.03.37.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jan 2018 03:37:51 -0800 (PST) From: Ilya Kuzmich To: buildroot@buildroot.org Date: Tue, 9 Jan 2018 14:37:43 +0300 Message-Id: <1515497863-13204-1-git-send-email-ilya.kuzmich@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <20171230175829.GH2921@scaer> References: <20171230175829.GH2921@scaer> Subject: [Buildroot] [v2 1/1] merge_config.sh: add br2-external support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ilya Kuzmich MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Pass BR2_EXTERNAL value via -e option. This will prevent merge_config.sh from silently eating any symbols defined in external trees on a clean buildroot tree invocation. Signed-off-by: Ilya Kuzmich Acked-by: "Yann E. MORIN" --- Changes v1 -> v2: Simplifications Signed-off-by: Ilya Kuzmich --- support/kconfig/merge_config.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/support/kconfig/merge_config.sh b/support/kconfig/merge_config.sh index 8a1708b..e1d7ffa 100755 --- a/support/kconfig/merge_config.sh +++ b/support/kconfig/merge_config.sh @@ -33,6 +33,7 @@ usage() { echo " -n use allnoconfig instead of alldefconfig" echo " -r list redundant entries when merging fragments" echo " -O dir to put generated output files" + echo " -e colon-separated list of br2-external trees to use (optional)" } MAKE=true @@ -71,6 +72,11 @@ while true; do shift 2 continue ;; + "-e") + EXTERNAL_ARG="BR2_EXTERNAL=$2" + shift 2 + continue + ;; *) break ;; @@ -131,7 +137,7 @@ fi # Use the merged file as the starting point for: # alldefconfig: Fills in any missing symbols with Kconfig default # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set -make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET +make KCONFIG_ALLCONFIG=$TMP_FILE $EXTERNAL_ARG $OUTPUT_ARG $ALLTARGET # Check all specified config values took (might have missed-dependency issues)