From patchwork Wed Mar 13 18:30:25 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: 227317 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 868C72C0084 for ; Thu, 14 Mar 2013 05:30:54 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 31EF4313A5; Wed, 13 Mar 2013 18:30:50 +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 pECQtIv2z3Gz; Wed, 13 Mar 2013 18:30:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C2A4631393; Wed, 13 Mar 2013 18:30:43 +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 1A5228F74B for ; Wed, 13 Mar 2013 18:30:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 977988CFA3 for ; Wed, 13 Mar 2013 18:30:42 +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 4cFzHSvaU9bT for ; Wed, 13 Mar 2013 18:30:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f54.google.com (mail-wg0-f54.google.com [74.125.82.54]) by whitealder.osuosl.org (Postfix) with ESMTPS id 85EAF8CF30 for ; Wed, 13 Mar 2013 18:30:41 +0000 (UTC) Received: by mail-wg0-f54.google.com with SMTP id fm10so1306486wgb.9 for ; Wed, 13 Mar 2013 11:30:39 -0700 (PDT) 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; bh=CgzbXC++FmsfFxFiGH7CJ8frqi+BmXPYq2C9sN2iFDk=; b=zpvZBCY2dZnmUIs0FnRwc7nTBCyg0EvpZx/c7HRB/DY5YAZxAS/ZlpJOfBIRCb8hTq tYf8n257BlpHbs8Epfsp4KJPXtkLpKHBxuRSi0XU3DBgQQJRVY1UcWwyHGEE4cJK+Bvs Kfdz+2PAJEcsSyVR4NsFkzs45qdccn3lMixWwwXGqpEUr8aSORocTqcQBFEIKWqzvzSB 8MdAOptVH8ZMxFSy/ZWzxdWJwE4ENbWq63Ngcz8iVvIKBVdbzCabG9rEqOgff5JeXQje IOlS3ZdiS9xkyXng6OlZ3LeBPXCfF+dkaWKcYd9ihP6TaXchzd8KPnoY1RtHMYOunChT fwdQ== X-Received: by 10.194.20.40 with SMTP id k8mr36523614wje.16.1363199439632; Wed, 13 Mar 2013 11:30:39 -0700 (PDT) Received: from localhost.localdomain (ARennes-555-1-262-17.w2-12.abo.wanadoo.fr. [2.12.69.17]) by mx.google.com with ESMTPS id c15sm4802569wiw.3.2013.03.13.11.30.37 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 13 Mar 2013 11:30:38 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@busybox.net Date: Wed, 13 Mar 2013 19:30:25 +0100 Message-Id: <1363199425-17105-1-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.7.2.5 Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH] toolchain/crosstool-NG: only use the un-tainted Buildroot version sting 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 The 'full' Buildroot version string contains the git cset hash, so will change for each commit in the current tree. As Przemyslaw points out, this will cause the crosstool-NG backend to rebuild the toolchain, as the 'full' Buildroot version is included in the crosstool-NG config (to further push down to the components version string). Using the 'full' Buildroot version string is arguably useful, so switch to using the 'simple' Buildroot version string instead. Reported-by: "Przemyslaw Wrzos" Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni --- toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk index 6554982..fbace5f 100644 --- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk +++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk @@ -206,7 +206,7 @@ CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_ARCH_(32|64)).*:\# \2 is not set:; CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_BIT)) is not set:\1=y:; CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_TARGET_VENDOR)=.*:\1="buildroot":; CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_TARGET_ALIAS)=.*:\1="$(ARCH)-linux":; -CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_TOOLCHAIN_PKGVERSION)="(.*)":\1="buildroot $(BR2_VERSION_FULL)":; +CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_TOOLCHAIN_PKGVERSION)="(.*)":\1="buildroot $(BR2_VERSION)":; ifneq ($(call qstrip,$(BR2_USE_MMU)),) CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_ARCH_USE_MMU) is not set:\1=y:; else