From patchwork Thu Mar 19 03:36:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Rowand X-Patchwork-Id: 6045511 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D219C9F440 for ; Thu, 19 Mar 2015 03:39:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 104CC204D3 for ; Thu, 19 Mar 2015 03:39:18 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3D088204D1 for ; Thu, 19 Mar 2015 03:39:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YYRG5-0005fj-Gi; Thu, 19 Mar 2015 03:36:33 +0000 Received: from mail-pd0-x22d.google.com ([2607:f8b0:400e:c02::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YYRG0-0005SI-8M for linux-arm-kernel@lists.infradead.org; Thu, 19 Mar 2015 03:36:28 +0000 Received: by pdbni2 with SMTP id ni2so62749331pdb.1 for ; Wed, 18 Mar 2015 20:36:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:reply-to:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=8CBi4Dpf/AySYP2z8EIiAkhk2K8dRLLVueRiADwpADM=; b=YVw4MjY2Z1UoN4iGF//Odlo6+ZysvUdkhu7Rota4R2zGWiBm362bxPobCjBVNEs/6y R8U+LVslIwqAq56fZbgsRbUMKPw5QqyUiOTxdB+3uYTrgjkCt8Iu50+NJYBjiHt8KfId 2dFdjb7Vp4DFdrMibvAsn/3re/4dkyLBCFwdYnTWkdK9nLwIqbZQhfs5FZscNMny07n3 cZxHc8jQHb51MbYtoM2IUyIeUDL+xvx2sF5Yl27O2PWWToNCzh+yJ3EnanttVNUfCFVk 78tIJpwxllkG4LTiNwV8L9xFesAIQ9BkXFUQTJGqVSMf8VUQallJccFaMU2f8YetzL/J Ux2g== X-Received: by 10.66.156.229 with SMTP id wh5mr169841949pab.119.1426736166678; Wed, 18 Mar 2015 20:36:06 -0700 (PDT) Received: from [172.26.79.213] ([64.211.224.253]) by mx.google.com with ESMTPSA id g10sm146019pdm.29.2015.03.18.20.36.04 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Mar 2015 20:36:05 -0700 (PDT) Message-ID: <550A4423.8040707@gmail.com> Date: Wed, 18 Mar 2015 20:36:03 -0700 From: Frank Rowand User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: frowand.list@gmail.com, Rob Herring , Grant Likely , Russell King , Michal Marek Subject: [patch 4/7] dt: dtb version: kernel Makefile References: <550A42AC.8060104@gmail.com> In-Reply-To: <550A42AC.8060104@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150318_203628_384441_24A71617 X-CRM114-Status: UNSURE ( 8.86 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: Mark Rutland , "devicetree@vger.kernel.org" , Pawel Moll , Ian Campbell , linux-kbuild@vger.kernel.org, Linux Kernel list , Leif Lindholm , Kumar Gala , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: frowand.list@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Frank Rowand Capture the initial value of .version_dtb so that when multiple .dtb files are created in a single make the make scripts will be able to increment .version_dtb only once instead of for each .dtb. Signed-off-by: Frank Rowand --- Makefile | 4 + Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile @@ -416,6 +416,9 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/s KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) +VERSION_DTB_BASE := $(shell cat .version_dtb 2> /dev/null) + +export VERSION_DTB_BASE export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC export CPP AR NM STRIP OBJCOPY OBJDUMP @@ -1181,6 +1184,7 @@ CLEAN_DIRS += $(MODVERDIR) MRPROPER_DIRS += include/config usr/include include/generated \ arch/*/include/generated .tmp_objdiff MRPROPER_FILES += .config .config.old .version .old_version \ + .version_dtb .version_dtb_flock \ Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ signing_key.priv signing_key.x509 x509.genkey \ extra_certificates signing_key.x509.keyid \