From patchwork Mon Jan 7 21:52:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 210246 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id F0B8B2C0093 for ; Tue, 8 Jan 2013 08:52:42 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 440F031043; Mon, 7 Jan 2013 21:52:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HWnY1d7uEMaS; Mon, 7 Jan 2013 21:52:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id BB6AE3102B; Mon, 7 Jan 2013 21:52:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9ED768F753 for ; Mon, 7 Jan 2013 21:52:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7989B8BDF6 for ; Mon, 7 Jan 2013 21:52:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k9mGvOkJPkbN for ; Mon, 7 Jan 2013 21:52:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com [74.125.82.48]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5688E8BC5B for ; Mon, 7 Jan 2013 21:52:15 +0000 (UTC) Received: by mail-wg0-f48.google.com with SMTP id dt10so9953336wgb.3 for ; Mon, 07 Jan 2013 13:52:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references; bh=7dEyJ6OZOO0C9/IFZWyW0XYnYzM/k1hbMY3QkLalQK4=; b=UgVEcd/Y/vW4igscj4Q7KydM3WQfSb+yV2QWytPp9mbgJGnHRzdxrk6OnBy615pnzT jpLzgStTDDW+58FZbDJB5IfkfsytgW9vbyH3uPGydp7YFi/s+yrOwcoGn52guAHljIfk /hJ07qtlzY7uH7Y5Ho1XRg4+LNA5SWA4S3QjDvhz26jd11Pr0PkJtY3v/DSMA4wu/UV1 EY160Lbv2SUK2HzzHjtJMXWNW5Yv9IP5KKgOWr+TCP0POO9HcTuxv9vtfiurQyAfe/SR S+vaRNDApdT0g1r1ptgWtypUKlGS78ycQx1qI7DOc/fEA8SMB86NxESYX83+3A0Q/+0M xMLQ== X-Received: by 10.180.99.129 with SMTP id eq1mr11498070wib.30.1357595533635; Mon, 07 Jan 2013 13:52:13 -0800 (PST) Received: from localhost.localdomain (ARennes-256-1-33-7.w90-32.abo.wanadoo.fr. [90.32.16.7]) by mx.google.com with ESMTPS id hu8sm13974823wib.6.2013.01.07.13.52.12 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 07 Jan 2013 13:52:12 -0800 (PST) From: "Yann E. MORIN" To: buildroot@busybox.net Date: Mon, 7 Jan 2013 22:52:04 +0100 Message-Id: X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 2/3] support/dependencies: use globally-exported BR2_CONFIG_FILE X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net No need to recreate a path we already have. Signed-off-by: "Yann E. MORIN" --- support/dependencies/dependencies.mk | 1 - support/dependencies/dependencies.sh | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk index cee2a48..ebe743a 100644 --- a/support/dependencies/dependencies.mk +++ b/support/dependencies/dependencies.mk @@ -22,7 +22,6 @@ endif core-dependencies: @HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \ - CONFIG_FILE="$(CONFIG_DIR)/.config" \ DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \ $(TOPDIR)/support/dependencies/dependencies.sh diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index ca58450..a542f25 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -147,8 +147,8 @@ for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio p fi done -if grep ^BR2_TOOLCHAIN_BUILDROOT=y $CONFIG_FILE > /dev/null && \ - grep ^BR2_ENABLE_LOCALE=y $CONFIG_FILE > /dev/null ; then +if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BR2_CONFIG_FILE > /dev/null && \ + grep ^BR2_ENABLE_LOCALE=y $BR2_CONFIG_FILE > /dev/null ; then if ! which locale > /dev/null ; then /bin/echo -e "\nYou need locale support on your build machine to build a toolchain supporting locales\n" exit 1 ; @@ -159,7 +159,7 @@ if grep ^BR2_TOOLCHAIN_BUILDROOT=y $CONFIG_FILE > /dev/null && \ fi fi -if grep -q ^BR2_PACKAGE_CLASSPATH=y $CONFIG_FILE ; then +if grep -q ^BR2_PACKAGE_CLASSPATH=y $BR2_CONFIG_FILE ; then for prog in javac jar; do if ! which $prog > /dev/null ; then /bin/echo -e "\nYou must install '$prog' on your build machine\n" >&2 @@ -168,7 +168,7 @@ if grep -q ^BR2_PACKAGE_CLASSPATH=y $CONFIG_FILE ; then done fi -if grep -E '^BR2_TARGET_GENERIC_ROOT_PASSWD=".+"$' $CONFIG_FILE > /dev/null 2>&1; then +if grep -E '^BR2_TARGET_GENERIC_ROOT_PASSWD=".+"$' $BR2_CONFIG_FILE > /dev/null 2>&1; then if ! which mkpasswd > /dev/null 2>&1; then /bin/echo -e "\nYou need the 'mkpasswd' utility to set the root password\n" /bin/echo -e "(in Debian/ubuntu, 'mkpasswd' provided by the whois package)\n" @@ -176,7 +176,7 @@ if grep -E '^BR2_TARGET_GENERIC_ROOT_PASSWD=".+"$' $CONFIG_FILE > /dev/null 2>&1 fi fi -if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $CONFIG_FILE ; then +if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BR2_CONFIG_FILE ; then if test ! -f /lib/ld-linux.so.2 ; then /bin/echo -e "\nYour Buildroot configuration uses pre-built tools for the x86 architecture," /bin/echo -e "but your build machine uses the x86-64 architecture without the 32 bits compatibility"