From patchwork Thu Oct 22 20:34:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 534580 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 4E73C14131C for ; Fri, 23 Oct 2015 07:34:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=xc+sOtkX; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 679EF936B2; Thu, 22 Oct 2015 20:34:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ifjCfycQ0zuh; Thu, 22 Oct 2015 20:34:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5846093F82; Thu, 22 Oct 2015 20:34:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 758B01CE71B for ; Thu, 22 Oct 2015 20:34:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 70E7B93291 for ; Thu, 22 Oct 2015 20:34:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TZftzFte8guw for ; Thu, 22 Oct 2015 20:34:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by hemlock.osuosl.org (Postfix) with ESMTPS id AFAE69307E for ; Thu, 22 Oct 2015 20:34:33 +0000 (UTC) Received: by wicll6 with SMTP id ll6so5116233wic.0 for ; Thu, 22 Oct 2015 13:34:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=gFz676KcTj+OqYmHzx2CHgcmN1fz5yJQVWfaD6F7TVk=; b=xc+sOtkXnhz8qqh1JWLeYYmDHGLNjD0xCF48BaMYkNjkYgrj3o8HAXV4O+8sE+KO/q sEJkP4xaSfnYOtRqtot+rmXpXVtn2U+SfKoQnaGIMxjMGisgmPRUMHUYygNr2BC2Hizi jvO1IPfEXrRl+6f7+ce4kfXDRlfRt8jfJDlqKsCetHOA31XRiKwRNqow+jeDVuIcqF61 2gn5SVOz3ZejPx0Jl/Ek5GKGOJRIGtCBiSsKus80fwlmS70aro5x+4HZKg56TlvrggnO OLHYMAtXjP/M4TVZ0OZwIbREYcCK2+wYYNksAC9FnzGVxBg0lrRahVGGRjTj5hPrQZpv cORA== X-Received: by 10.194.205.162 with SMTP id lh2mr19230969wjc.61.1445546072387; Thu, 22 Oct 2015 13:34:32 -0700 (PDT) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id jt9sm3691097wjc.24.2015.10.22.13.34.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Oct 2015 13:34:31 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Thu, 22 Oct 2015 22:34:07 +0200 Message-Id: <177fa1d338591b375532eedc587d6012e876a407.1445545973.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: Thomas Petazzoni , "Yann E. MORIN" , Peter Korsgaard Subject: [Buildroot] [PATCH 12/21 v2] core: do not hard-code inclusion of br2-external in Kconfig 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" Move the inclusion of br2-external's Config.in to the generated kconfig snippet. This will ultimately allow us to use more than one br2-external tree. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Thomas De Schampheleire Cc: Arnout Vandecappelle --- Config.in | 7 ------- Makefile | 8 +++++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Config.in b/Config.in index a0fb1ea..512c049 100644 --- a/Config.in +++ b/Config.in @@ -645,11 +645,4 @@ source "package/Config.in.host" source "Config.in.legacy" -menu "User-provided options" - depends on BR2_EXTERNAL != "support/dummy-external" - -source "$BR2_EXTERNAL/Config.in" - -endmenu - source "$BR2_BUILD_DIR/.br2-external.in" diff --git a/Makefile b/Makefile index af9aab4..1ee44a6 100644 --- a/Makefile +++ b/Makefile @@ -823,7 +823,13 @@ endif .PHONY: $(BUILD_DIR)/.br2-external.in $(BUILD_DIR)/.br2-external.in: $(BUILD_DIR) - @touch $@ + $(Q)( \ + printf "#\n# Automatically generated file; DO NOT EDIT.\n#\n\n"; \ + printf 'menu "User-provided options"\n'; \ + printf '\tdepends on BR2_EXTERNAL != "support/dummy-external"\n\n'; \ + printf 'source "%s/Config.in"\n\n' $$(cd $(BR2_EXTERNAL) >/dev/null 2>&1 && pwd); \ + printf 'endmenu # User-provided options\n'; \ + ) >$@ # printvars prints all the variables currently defined in our Makefiles printvars: