From patchwork Wed Oct 24 07:17:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 193697 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 040242C008B for ; Wed, 24 Oct 2012 18:18:18 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9A571A03E2; Wed, 24 Oct 2012 07:18:16 +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 8Alq44ifvKkX; Wed, 24 Oct 2012 07:18:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 91A69A03A1; Wed, 24 Oct 2012 07:17:55 +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 84E908F74A for ; Wed, 24 Oct 2012 07:17:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 21B498C1A1 for ; Wed, 24 Oct 2012 07:17:40 +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 72qDkZUTfPB2 for ; Wed, 24 Oct 2012 07:17:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4F03B8C1A8 for ; Wed, 24 Oct 2012 07:17:38 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1TQvDa-0000Xb-B4; Wed, 24 Oct 2012 09:17:34 +0200 Received: from arnout by vandecaa-laptop with local (Exim 4.80) (envelope-from ) id 1TQvDZ-0004X7-Dd; Wed, 24 Oct 2012 09:17:33 +0200 From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@busybox.net Date: Wed, 24 Oct 2012 09:17:06 +0200 Message-Id: <1351063027-13800-10-git-send-email-arnout@mind.be> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351063027-13800-1-git-send-email-arnout@mind.be> References: <1351063027-13800-1-git-send-email-arnout@mind.be> Subject: [Buildroot] [PATCHv2 09/10] uClibc: update-all-config shouldn't update default uClibc config 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 From: "Arnout Vandecappelle (Essensium/Mind)" The new update-all-config target will update the uClibc config file if BR2_UCLIBC_CONFIG is set, even if it is set to the default value in toolchain/uClibc/uClibc-xxx.config. To avoid this, set the default BR2_UCLIBC_CONFIG to empty, and select a default to use in the .mk file. Note that uclibc-update-config will still overwrite the default file in toolchain/uClibc/uClibc-xxx.config - presumably it's intentional. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Luca Ceresoli --- toolchain/uClibc/Config.in | 7 ++----- toolchain/uClibc/uclibc.mk | 23 +++++++++++------------ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index f46a415..9cce05d 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -42,15 +42,12 @@ config BR2_UCLIBC_VERSION_STRING config BR2_UCLIBC_CONFIG string "uClibc configuration file to use?" - default "toolchain/uClibc/uClibc-0.9.31.config" if BR2_UCLIBC_VERSION_0_9_31 - default "toolchain/uClibc/uClibc-0.9.32.config" if BR2_UCLIBC_VERSION_0_9_32 - default "toolchain/uClibc/uClibc-0.9.33.config" if BR2_UCLIBC_VERSION_0_9_33 - default "toolchain/uClibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT + default "" help Some people may wish to use their own modified uClibc configuration file and will specify their config file location with this option. See also docs/README in this package. - If unsure, use the default. + If left empty, a default configuration will be used. config BR2_PTHREAD_DEBUG bool "Thread library debugging" diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 0faaf18..d032684 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -6,22 +6,21 @@ ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) -# specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config -# setting. -ifndef UCLIBC_CONFIG_FILE -UCLIBC_CONFIG_FILE=$(call qstrip,$(BR2_UCLIBC_CONFIG)) -endif - -UCLIBC_VERSION:=$(call qstrip,$(BR2_UCLIBC_VERSION_STRING)) +UCLIBC_VERSION = $(call qstrip,$(BR2_UCLIBC_VERSION_STRING)) ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y) -UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots -UCLIBC_DIR:=$(TOOLCHAIN_DIR)/uClibc +UCLIBC_SITE = http://www.uclibc.org/downloads/snapshots +UCLIBC_DIR = $(TOOLCHAIN_DIR)/uClibc +UCLIBC_CONFIG_VERSION = snapshot else -UCLIBC_SITE:=http://www.uclibc.org/downloads -UCLIBC_DIR:=$(TOOLCHAIN_DIR)/uClibc-$(UCLIBC_VERSION) +UCLIBC_SITE = http://www.uclibc.org/downloads +UCLIBC_DIR = $(TOOLCHAIN_DIR)/uClibc-$(UCLIBC_VERSION) +UCLIBC_CONFIG_VERSION = $(subst $(space),.,$(wordlist 1,3,$(subst .,$(space),$(UCLIBC_VERSION)))) endif +UCLIBC_CONFIG = $(call qstrip,$(BR2_UCLIBC_CONFIG)) +UCLIBC_CONFIG_FILE = $(or $(wildcard $(UCLIBC_CONFIG)),toolchain/uClibc/uClibc-$(UCLIBC_CONFIG_VERSION).config) + UCLIBC_PATCH_DIR:=toolchain/uClibc/ UCLIBC_SOURCE:=uClibc-$(UCLIBC_VERSION).tar.bz2 @@ -508,7 +507,7 @@ uclibc-oldconfig: $(UCLIBC_DIR)/.oldconfig uclibc-update-config: uclibc-config cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE) -ifneq ($(UCLIBC_CONFIG_FILE),) +ifneq ($(UCLIBC_CONFIG),) UPDATE_ALL_CONFIG_TARGETS += uclibc-update-config endif