From patchwork Fri Sep 22 05:31:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 113959 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp2876137qgf; Thu, 21 Sep 2017 22:33:06 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAZ0P3fAhx0xdeOeKw+U1Ci9SRxlIHjMs5UBH2UAt/bcJTKBjL9FyOtw7Xd2fLixOuymDTp X-Received: by 10.84.133.14 with SMTP id 14mr8021262plf.167.1506058386333; Thu, 21 Sep 2017 22:33:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506058386; cv=none; d=google.com; s=arc-20160816; b=0Qrt9kbbnmpkvx+DcFbvK7SAozKvwmqjKk16bdnYjsI0K4VAQjpjre6qpBbtZDGdz9 bTA4c9/fCh61+JdIozti8D9KLAgfZyPTjWpHxz6tuKqMmVDUUbcC95y1c2y3KcYkwyno +JJkeAhejb0UkkpYhMdUMfLH+B8ixJt4twPUtGMTtESevCeEqej21LiCdDbVOeUqGi94 byMH2V/digiyzRRC43UmksWsjHVSRgF0HYpp3naSETOdQBfQscm7CuxW4W3pc5gXHz53 M37y1/OFav7N8xRVszjopLf9QmETsINpHc5UYdsoVgJsFEX3V/bAKd3qr7wLXB19sqA2 u4MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=wS6Wk7hCy3fKIHsVQ4jMsQUsAd6tDbpDIWlLgYQRqrE=; b=jYFOhzqkheUJyNwxN0hdaH6TeayS0NhYiJwAWWn2pleW3j+c+I9cDL5n6E1v5wJQxB LUtWk7XoRjyQVpVA7po7JHMSzPmcoy2GStC/CQ7zGCq2Y/dbwKNLoqsV5T0SnWNGz+vS vIy2fR1QBu0g03lg5PpB2bbBdqE/I/dLPpqF2HQgpUze0aC8Ah12PycCmVoIMVwzuNa6 Fr/yxwz1dsmVAlH+wbd7mAjOiRuRamPaUSMtNL+C0aofRUd9Y/JWgB9yGdMsiXkgwzXN 5lvCb4MXjkP31KwmuCNmAV0TddG4Jyx5PNy0AtwwtiyLxzEFxLtqhdFB4qUFLT+Jm4Gy o7hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=LEm/Z5qm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s188si2471896pgs.176.2017.09.21.22.33.06; Thu, 21 Sep 2017 22:33:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=LEm/Z5qm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751875AbdIVFdE (ORCPT + 26 others); Fri, 22 Sep 2017 01:33:04 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:56788 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751637AbdIVFdC (ORCPT ); Fri, 22 Sep 2017 01:33:02 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id v8M5VMM5022847; Fri, 22 Sep 2017 14:31:22 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v8M5VMM5022847 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1506058283; bh=wS6Wk7hCy3fKIHsVQ4jMsQUsAd6tDbpDIWlLgYQRqrE=; h=From:To:Cc:Subject:Date:From; b=LEm/Z5qm1ZoRX0IGLcJ7tCOA3XzHS1+wOpocvnt0qRLVZ0/jQIXCO9sZLSMBRafHQ yUbbRIT0ViE7MpSZvR2rbd2lhAQx3EZCaPMVf3JfApKF+urn4lEpNhke/VRvcAhF4j 5e8iIdOFr6ErF94qVq0qL2YJ4rKJlEYk7joYQHIURHdlZsGq6/EcfnxTwcMEXSO6Km fP5O6G+Um77E3WL8SKe5NqzlYnyJ3l4+dCCUX8y4wvpoSHNY5SsjJVxg5tLpAkBJ8e FxTuhfRvHvKRkHuGZgIa1FC9qySKMRUJGaU/a0l0mdjNaiNgqV0goLzscDa/qY+2FH Es9upPMFqMKIQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Masahiro Yamada , Michal Marek , Nicholas Piggin , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] kbuild: link-vmlinux.sh: simplify .version increment Date: Fri, 22 Sep 2017 14:31:13 +0900 Message-Id: <1506058274-30516-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since commit 1f2bfbd00e46 ("kbuild: link of vmlinux moved to a script"), it is easy to increment .version without using a temporary file .old_version. I do not see anybody who creates .tmp_version any more. Probably it is a left-over of commit 4e25d8bb9550fb ("[PATCH] kbuild: adjust .version updating"). Just remove it. Signed-off-by: Masahiro Yamada --- Makefile | 2 +- scripts/link-vmlinux.sh | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) -- 2.7.4 diff --git a/Makefile b/Makefile index 64cbc66..9e2781d 100644 --- a/Makefile +++ b/Makefile @@ -1278,7 +1278,7 @@ CLEAN_DIRS += $(MODVERDIR) # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config usr/include include/generated \ arch/*/include/generated .tmp_objdiff -MRPROPER_FILES += .config .config.old .version .old_version \ +MRPROPER_FILES += .config .config.old .version \ Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ signing_key.pem signing_key.priv signing_key.x509 \ x509.genkey extra_certificates signing_key.x509.keyid \ diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index e7b7eee..0cdb25b 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -187,10 +187,8 @@ sortextable() # Delete output files in case of error cleanup() { - rm -f .old_version rm -f .tmp_System.map rm -f .tmp_kallsyms* - rm -f .tmp_version rm -f .tmp_vmlinux* rm -f built-in.o rm -f System.map @@ -238,12 +236,12 @@ esac # Update version info GEN .version -if [ ! -r .version ]; then - rm -f .version; - echo 1 >.version; +if [ -r .version ]; then + VERSION=$(expr 0$(cat .version) + 1) + echo $VERSION > .version else - mv .version .old_version; - expr 0$(cat .old_version) + 1 >.version; + rm -f .version + echo 1 > .version fi; # final build of init/ @@ -331,6 +329,3 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then exit 1 fi fi - -# We made a new kernel - delete old version file -rm -f .old_version From patchwork Fri Sep 22 05:31:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 113958 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp2875983qgf; Thu, 21 Sep 2017 22:32:56 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCvgmtiq72VpKl4FWdnMsp4XF3xv6yIcC0eNyN/fEKPj7nYVAgB1bjmikWY4JepzwdialGX X-Received: by 10.84.129.193 with SMTP id b59mr7860435plb.52.1506058375778; Thu, 21 Sep 2017 22:32:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506058375; cv=none; d=google.com; s=arc-20160816; b=TRxWHZ8Bs0mGAQx13byLgRuorkqDiWxDvoLk2lsM6f2RQTybY0s8jmqxWZZgPcU4n5 lqN3QzY6aA0+ddiJgJRVEt8Bpt03i1LCDnc09BGizZfDkGy5CI8+HyalCmc87uJfbNXa zR9qM7xcBoMA74uGpvc2wSxMbC0Jd+8jDtx/hmI87d3nuGJ4L+wHBawxxHrGwrwHd9bY W86G4LYdwibzttiKUchvYrpRXPjnpsFY4ZfaFesomwLE3zBjfPOce3qmwz8UVUXkMib/ PL66yXcSlw8mHddo3kLR0rou/iHxPZiuw/Li2s1r8MgaDnOnbKTWxzoAq6MqsgJOCNGA IHkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=ivPc8fIPgXOrkoNKJzUle2PLpzu57NcIaZVqdUbN9p4=; b=mmJLbw6atKRJXFCOlX7rENCaaB1Goo1UCJGiZASJ+lXCMEMhzwcLqZcWXoRYwDEiMo Y5yc1Tcb2+qpS1BNEHnwjJWFnzXEURXB9qKMGogBulk78+uceiSwSf4Ii0/hr/PHVN3/ j2+x6sdHm0p3gAXdYRXtTN+TQSqu3g7Gb/zrHUxoeXYoQjj4tEuI/IRteRWGdCn3gX7W EIAGdkXUSjGDEQlkXe+lHEyzA+kvDDr8lG8uMkWg65/a7Fj341o0BiggjStdhcZWJu1d ghNVJuuuSN7g8icsvI8yX5yeo5VtXGZocV+2CRgjkmhZv5gJ3rnIv7umc2P6mopS5fZh DPhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=B5m7PXzi; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o4si2219323pgq.475.2017.09.21.22.32.55; Thu, 21 Sep 2017 22:32:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=B5m7PXzi; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751851AbdIVFcx (ORCPT + 26 others); Fri, 22 Sep 2017 01:32:53 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:56449 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751637AbdIVFcv (ORCPT ); Fri, 22 Sep 2017 01:32:51 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id v8M5VMM6022847; Fri, 22 Sep 2017 14:31:23 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v8M5VMM6022847 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1506058283; bh=ivPc8fIPgXOrkoNKJzUle2PLpzu57NcIaZVqdUbN9p4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B5m7PXzijcQEoO5KI00+OCjdtWSxTt7R6Fo8ZZQD9Iuzi6A2LDwjEArHav+SSCHCs W1Ow/T7Z61bf332OXpdUUg5J5kTTTrLdJR+4IJg9S1m4o7cizVA7D9aWDDSef7BVwu CJJH6HgTGwWVCou5AGOXbLEdVQyzz494P3gbqneCmQI6wcaQJPpB9G0qkXPypmYeqP Aj3wcyDVijoAkGJyVCGWOKucZZEJeR6FT/Am6KzxWivBgrV8RP+7QtW9wguNKgXXX9 l2xV8Z0hWkI3VBeV+iOKE+UQ4D/uoFZUWhbxgdDDHhofzKTmJd2mMYY1gQGj1H6gm7 sG1qL5OYt7cVg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] kbuild: mkcompile_h: do not create .version Date: Fri, 22 Sep 2017 14:31:14 +0900 Message-Id: <1506058274-30516-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506058274-30516-1-git-send-email-yamada.masahiro@socionext.com> References: <1506058274-30516-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This script need not to create .version; it will be created by scripts/link-vmlinux.sh later. Clean-up the code slightly. Signed-off-by: Masahiro Yamada --- scripts/mkcompile_h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -- 2.7.4 diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h index fd8fdb9..f1ee4eb 100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h @@ -27,12 +27,7 @@ LC_ALL=C export LC_ALL if [ -z "$KBUILD_BUILD_VERSION" ]; then - if [ -r .version ]; then - VERSION=`cat .version` - else - VERSION=0 - echo 0 > .version - fi + VERSION=$(cat .version 2>/dev/null || echo 1) else VERSION=$KBUILD_BUILD_VERSION fi