From: Tom Rini Date: Tue, 25 Aug 2020 08:56:34 -0400 Subject: [PATCH U-Boot] scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks In-Reply-To: <20200825112950.6993-1-rasmus.villemoes@prevas.dk> References: <20200825112950.6993-1-rasmus.villemoes@prevas.dk> Message-ID: <20200825125634.GL20605@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Tue, Aug 25, 2020 at 01:29:50PM +0200, Rasmus Villemoes wrote: > From: Brian Norris > > [linux commit ff64dd4857303dd5550faed9fd598ac90f0f2238] > > git-diff-index does not refresh the index for you, so using it for a > "-dirty" check can give misleading results. Commit 6147b1cf19651 > ("scripts/setlocalversion: git: Make -dirty check more robust") tried to > fix this by switching to git-status, but it overlooked the fact that > git-status also writes to the .git directory of the source tree, which > is definitely not kosher for an out-of-tree (O=) build. That is getting > reverted. > > Fortunately, git-status now supports avoiding writing to the index via > the --no-optional-locks flag, as of git 2.14. It still calculates an > up-to-date index, but it avoids writing it out to the .git directory. > > So, let's retry the solution from commit 6147b1cf19651 using this new > flag first, and if it fails, we assume this is an older version of git > and just use the old git-diff-index method. > > It's hairy to get the 'grep -vq' (inverted matching) correct by stashing > the output of git-status (you have to be careful about the difference > betwen "empty stdin" and "blank line on stdin"), so just pipe the output > directly to grep and use a regex that's good enough for both the > git-status and git-diff-index version. > > Cc: Christian Kujau > Cc: Guenter Roeck > Suggested-by: Alexander Kapshuk > Signed-off-by: Brian Norris > Tested-by: Genki Sky > Signed-off-by: Masahiro Yamada > Signed-off-by: Rasmus Villemoes > --- > This fixes real problems when building U-Boot via Yocto, since > Yocto creates hard-links to certain files in the source > repository, causing the "git diff-index" method to report -dirty, > even if no file contents are actually changed. See e.g. > > https://lists.openembedded.org/g/openembedded-core/message/137702 > > scripts/setlocalversion | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) It looks like we have one local change to setlocalversion since our sync from v3.16. Can you please re-sync us to the v5.8 release? Thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: