[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210523031428.164186-3-masahiroy@kernel.org>
Date: Sun, 23 May 2021 12:14:26 +0900
From: Masahiro Yamada <masahiroy@...nel.org>
To: linux-kbuild@...r.kernel.org
Cc: Nico Schottelius <nico-linuxsetlocalversion@...ottelius.org>,
Masahiro Yamada <masahiroy@...nel.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Matthias Maennich <maennich@...gle.com>,
Michael Ellerman <mpe@...erman.id.au>,
Rasmus Villemoes <linux@...musvillemoes.dk>,
linux-kernel@...r.kernel.org
Subject: [PATCH 3/5] scripts/setlocalversion: add more comments to -dirty flag detection
This script stumbled on the read-only source tree over again:
- a2bb90a08cb3 ("kbuild: fix delay in setlocalversion on readonly
source")
- cdf2bc632ebc ("scripts/setlocalversion on write-protected source
tree")
- 8ef14c2c41d9 ("Revert "scripts/setlocalversion: git: Make -dirty
check more robust"")
- ff64dd485730 ("scripts/setlocalversion: Improve -dirty check with
git-status --no-optional-locks")
Add comments to clarify that this script should never ever try to write
to the source tree.
'git describe --dirty' might look as a simple solution for appending
the -dirty string, but we cannot use it because it creates the
.git/index.lock file.
Signed-off-by: Masahiro Yamada <masahiroy@...nel.org>
---
scripts/setlocalversion | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index f3084d6bbb22..6865df6699c8 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -80,6 +80,10 @@ scm_version()
fi
# Check for uncommitted changes.
+ # This script must avoid any write attempt to the source tree,
+ # which might be read-only.
+ # You cannot use 'git describe --dirty' because it tries to
+ # create .git/index.lock .
# First, with git-status, but --no-optional-locks is only
# supported in git >= 2.14, so fall back to git-diff-index if
# it fails. Note that git-diff-index does not refresh the
--
2.27.0
Powered by blists - more mailing lists