[PATCH U-Boot] scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks

Tom Rini trini at konsulko.com
Tue Aug 25 14:56:34 CEST 2020

On Tue, Aug 25, 2020 at 01:29:50PM +0200, Rasmus Villemoes wrote:

> From: Brian Norris <briannorris at chromium.org>
> [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 <lists at nerdbynature.de>
> Cc: Guenter Roeck <linux at roeck-us.net>
> Suggested-by: Alexander Kapshuk <alexander.kapshuk at gmail.com>
> Signed-off-by: Brian Norris <briannorris at chromium.org>
> Tested-by: Genki Sky <sky at genki.is>
> Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>
> Signed-off-by: Rasmus Villemoes <rasmus.villemoes at prevas.dk>
> ---
> 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!

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200825/f5ea5eb2/attachment.sig>

More information about the U-Boot mailing list