From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 05C8AC388F9 for ; Fri, 23 Oct 2020 23:22:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A5E321D43 for ; Fri, 23 Oct 2020 23:22:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=rasmusvillemoes.dk header.i=@rasmusvillemoes.dk header.b="WPW0NNDd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758578AbgJWXW1 (ORCPT ); Fri, 23 Oct 2020 19:22:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754381AbgJWXW1 (ORCPT ); Fri, 23 Oct 2020 19:22:27 -0400 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3751C0613CE for ; Fri, 23 Oct 2020 16:22:26 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id c15so4609000ejs.0 for ; Fri, 23 Oct 2020 16:22:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IsEIFoe7sZUuYhcMcTQFflZv80V+XCrEWT+PDhHP6xY=; b=WPW0NNDdKQvCSAhhDOrwNw9dMjbs6A8JVXUrjTqIgR7bsnYa6xixXVEKNbvnju0c5t MRcXdP28n33qfWwKDTG/15TYQVG6kCYEW0a+6tG9z6XSJB1IToGvXw+NwjAwkxSfNnQ/ lhz4yx1sLnKH/IrdCZ1Lg0SQwSqiH42iRTpf8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IsEIFoe7sZUuYhcMcTQFflZv80V+XCrEWT+PDhHP6xY=; b=sjfpZkyCRNB3whe4GJdfS7SKD42lGI96oUEiPIfU4vd0vvDu1NkS9ZwonDmLaoQTWa hGfw6Mltqx8ZuigSyvdL6gg1wlDeqaedT4inn1Ks+JaoGo8aA4/zLP63eg7RL1cUWY/P puz2ZsyVAE2rEO8HXbrnbaJrGARu8o8eGQEvLuKIEDa8hGaVuEP5N2PxQvTe7A/QWcUn Nw5m4a3ZWa7c2zia11RvlVHf3Nkgq78VMbnXVMYHFsljxICONrWQCvwtuZAQ4LsjRxoG kYVOyjyewsDHQY3Ed3j9xhKaGtp/BdDWphxIonr3CWaERTiye+Cjk2XkGcm6jZE9nWDo LIZw== X-Gm-Message-State: AOAM530ZBxDrzSn4lGRh8dMKvQ1cc/bHE3XvLTPyY4hMDuLLON/M4sUE jAg8A5AY28QDeNIM7wQOCdO/rQ== X-Google-Smtp-Source: ABdhPJwHFQQs9h1GtuNWhnvYjSEssXP1pmsJpJk3lNxPNHQCXTndKGBRBBWs85n9Hf/Ekk9osTPoZg== X-Received: by 2002:a17:906:3ada:: with SMTP id z26mr4249760ejd.151.1603495345371; Fri, 23 Oct 2020 16:22:25 -0700 (PDT) Received: from prevas-ravi.aaad.autarch.net (5.186.115.188.cgn.fibianet.dk. [5.186.115.188]) by smtp.gmail.com with ESMTPSA id ck19sm1474650ejb.99.2020.10.23.16.22.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 16:22:24 -0700 (PDT) From: Rasmus Villemoes To: stable@vger.kernel.org, Masahiro Yamada , Rasmus Villemoes Cc: Greg KH , linux-kernel@vger.kernel.org Subject: [PATCH 4.9-stable] scripts/setlocalversion: make git describe output more reliable Date: Sat, 24 Oct 2020 01:22:20 +0200 Message-Id: <20201023232220.10448-1-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org commit 548b8b5168c90c42e88f70fcf041b4ce0b8e7aa8 upstream. When building for an embedded target using Yocto, we're sometimes observing that the version string that gets built into vmlinux (and thus what uname -a reports) differs from the path under /lib/modules/ where modules get installed in the rootfs, but only in the length of the -gabc123def suffix. Hence modprobe always fails. The problem is that Yocto has the concept of "sstate" (shared state), which allows different developers/buildbots/etc. to share build artifacts, based on a hash of all the metadata that went into building that artifact - and that metadata includes all dependencies (e.g. the compiler used etc.). That normally works quite well; usually a clean build (without using any sstate cache) done by one developer ends up being binary identical to a build done on another host. However, one thing that can cause two developers to end up with different builds [and thus make one's vmlinux package incompatible with the other's kernel-dev package], which is not captured by the metadata hashing, is this `git describe`: The output of that can be affected by (1) git version: before 2.11 git defaulted to a minimum of 7, since 2.11 (git.git commit e6c587) the default is dynamic based on the number of objects in the repo (2) hence even if both run the same git version, the output can differ based on how many remotes are being tracked (or just lots of local development branches or plain old garbage) (3) and of course somebody could have a core.abbrev config setting in ~/.gitconfig So in order to avoid `uname -a` output relying on such random details of the build environment which are rather hard to ensure are consistent between developers and buildbots, make sure the abbreviated sha1 always consists of exactly 12 hex characters. That is consistent with the current rule for -stable patches, and is almost always enough to identify the head commit unambigously - in the few cases where it does not, the v5.4.3-00021- prefix would certainly nail it down. [Adapt to `` vs $() differences between 4.9 and upstream.] Signed-off-by: Rasmus Villemoes Signed-off-by: Masahiro Yamada --- scripts/setlocalversion | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index aa28c3f29809314bfa58..0c8741b795d0c82a38c9 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -44,7 +44,7 @@ scm_version() # Check for git and a git repo. if test -z "$(git rev-parse --show-cdup 2>/dev/null)" && - head=`git rev-parse --verify --short HEAD 2>/dev/null`; then + 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. @@ -58,11 +58,22 @@ scm_version() fi # If we are past a tagged commit (like # "v2.6.30-rc5-302-g72357d5"), we pretty print it. - if atag="`git describe 2>/dev/null`"; then - echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}' - - # If we don't have a tag at all we print -g{commitish}. + # + # Ensure the abbreviated sha1 has exactly 12 + # hex characters, to make the output + # independent of git version, local + # core.abbrev settings and/or total number of + # objects in the current repository - passing + # --abbrev=12 ensures a minimum of 12, and the + # awk substr() then picks the 'g' and first 12 + # hex chars. + if atag="$(git describe --abbrev=12 2>/dev/null)"; then + echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),substr($(NF),0,13))}' + + # If we don't have a tag at all we print -g{commitish}, + # again using exactly 12 hex chars. else + head="$(echo $head | cut -c1-12)" printf '%s%s' -g $head fi fi -- 2.23.0