From patchwork Sat Nov 21 01:16:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William McVicker X-Patchwork-Id: 11923051 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-25.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, HK_RANDOM_FROM,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0E98C63798 for ; Sat, 21 Nov 2020 01:17:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A23BA20729 for ; Sat, 21 Nov 2020 01:17:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rrOCXQ7O" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728766AbgKUBRD (ORCPT ); Fri, 20 Nov 2020 20:17:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728048AbgKUBRD (ORCPT ); Fri, 20 Nov 2020 20:17:03 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A713C061A04 for ; Fri, 20 Nov 2020 17:17:03 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id e68so5835879pfe.4 for ; Fri, 20 Nov 2020 17:17:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=TNX3l7PvITod9AihyAxf0YX+RSr83EEV++pnt+PpErM=; b=rrOCXQ7OHW2jSnsjpU3VGkPy5lRIPHSawzigfCWabrgQMh3mtEG1C6BApzF/r0gjgF 4clCEUnxf1BOe4mR8I5kWg7wy0HmwVHmjKrtnbNFoot7Tvsj40gpwPqfO8IN8b7MeZG2 bqPpnUwQnSM2aGyQ6PG+Z34sm8Yk0faGb/GT8p8EApc5P9XmwBhnhT3m7z1nfKj9wjKF OaQvCEBpUktVLHPL+Iq2BjZ6AejVja8HgvBPrMl2ARQplq1bEtoXejhNWpQnsMzRRFt/ 0Pz5XCiyo03caC30och2sRseMdFSShCMllfY5iBokkvpuGJv4lW/8iymoY64UgUP9FXH BG/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=TNX3l7PvITod9AihyAxf0YX+RSr83EEV++pnt+PpErM=; b=FvINhugWR6bu00g99D8dtRa2sndt408a+mH0IsUvF+rcU3CxMJxRqFxVepitY+RsTy c2MO4TEfqLf52JiKxodAyYkjdnnoy/1Z2+U9cWztHnoHNKMyJIu+vHW2am+bOX6wmRDL qXg4da12i5LPo3hZR3teoEx53cW0RB1vATg/DQkONLBeleBeINmqUmWEN0MaDFrweRTC p/5sb7LVeroBOr9jPaX1Ht9p2QzKWwUTy7BLEOUtw08CuuqwxfxiDQvYYz7T82VNLwNG yW3+8CYYWbW/z/RMymHMUIJ4O77nEK9CiPVLoIzvDCNwYUV2F2Xg2fYHBnXDtfq9x+KI gV9w== X-Gm-Message-State: AOAM531ScTuaeEBLTZfdVktCJ6DVbFtXfUAQjFxVORNtcq9E6eVXw5qU Ur/GCzhnw2vaa30r5poCYGvWHoQzK2aYB9hpVlc= X-Google-Smtp-Source: ABdhPJzueX8rS/Go8MrAki9gFw6IiZ0+350kHGHWwk5pESmHkMzUcrIPdQZ4dtHkeJw75qDmUFBpmPd7X/xPFksqBUQ= Sender: "willmcvicker via sendgmr" X-Received: from willmcvicker.c.googlers.com ([fda3:e722:ac3:10:24:72f4:c0a8:2dd0]) (user=willmcvicker job=sendgmr) by 2002:a17:902:bf48:b029:d8:abd5:7670 with SMTP id u8-20020a170902bf48b02900d8abd57670mr15224060pls.85.1605921423003; Fri, 20 Nov 2020 17:17:03 -0800 (PST) Date: Sat, 21 Nov 2020 01:16:50 +0000 In-Reply-To: <20201121011652.2006613-1-willmcvicker@google.com> Message-Id: <20201121011652.2006613-2-willmcvicker@google.com> Mime-Version: 1.0 References: <20201121011652.2006613-1-willmcvicker@google.com> X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog Subject: [PATCH v1 1/2] scripts/setlocalversion: allow running in a subdir From: Will McVicker To: Jessica Yu , Masahiro Yamada , Michal Marek Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, kernel-team@google.com, Will McVicker Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Getting the scmversion using scripts/setlocalversion currently only works when run at the root of a git or mecurial project. This was introduced in commit 8558f59edf93 ("setlocalversion: Ignote SCMs above the linux source tree") so that if one is building within a subdir of a git tree that isn't the kernel git project, then the vermagic wouldn't include that git sha1. However, the proper solution to that is to just set this config in your defconfig: # CONFIG_LOCALVERSION_AUTO is not set which is already the default in many defconfigs: $ grep -r "CONFIG_LOCALVERSION_AUTO is not set" arch/* | wc -l 89 So let's bring back this functionality so that we can use scripts/setlocalversion to capture the SCM version of external modules that reside within subdirectories of an SCM project. Signed-off-by: Will McVicker --- scripts/setlocalversion | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index bb709eda96cd..cd42009e675b 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -44,8 +44,7 @@ scm_version() fi # Check for git and a git repo. - if test -z "$(git rev-parse --show-cdup 2>/dev/null)" && - head=$(git rev-parse --verify HEAD 2>/dev/null); then + if head=$(git rev-parse --verify HEAD 2>/dev/null); then # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore # it, because this version is defined in the top level Makefile. @@ -102,7 +101,7 @@ scm_version() fi # Check for mercurial and a mercurial repo. - if test -d .hg && hgid=$(hg id 2>/dev/null); then + if hgid=$(hg id 2>/dev/null); then # Do we have an tagged version? If so, latesttagdistance == 1 if [ "$(hg log -r . --template '{latesttagdistance}')" = "1" ]; then id=$(hg log -r . --template '{latesttag}')