[PATCH v2] scripts/setlocalversion: sync with linux 5.8

Tom Rini trini at konsulko.com
Fri Aug 28 14:55:19 CEST 2020

On Tue, Aug 25, 2020 at 05:28:39PM +0200, Rasmus Villemoes wrote:

> The linux changes since v3.16 are
> 78283edf2c01 kbuild: setlocalversion: print error to STDERR
> b24413180f56 License cleanup: add SPDX GPL-2.0 license identifier to files with no license
> 6147b1cf1965 scripts/setlocalversion: git: Make -dirty check more robust
> 8ef14c2c41d9 Revert "scripts/setlocalversion: git: Make -dirty check more robust"
> ff64dd485730 scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks
> 7a82e3fa28f1 scripts/setlocalversion: clear local variable to make it work for sh
> 991b78fbd223 scripts: setlocalversion: fix a bashism
> 3c96bdd0ebfa scripts: setlocalversion: replace backquote to dollar parenthesis
> and it's ff64dd485730 that is the motivation for this sync. It fixes
> false positive "-dirty" added to the version string when building with
> Yocto
> (https://lists.openembedded.org/g/openembedded-core/message/137702).
> There has been one U-Boot specific patch since this was synced with
> linux 3.16: 81630a3b38c2 (scripts: setlocalversion: safely extract
> variables from auto.conf using awk). Keep these changes applied.
> Signed-off-by: Rasmus Villemoes <rasmus.villemoes at prevas.dk>
> [trini: Re-add 81630a3b38c2 and reword message]
> Signed-off-by: Tom Rini <trini at konsulko.com>

Build testing the world showed that we really did need to keep
81630a3b38c2 so I put that back in (fixing whitespace in it) and
reworded the commit message.

Applied to u-boot/master, 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/20200828/02725995/attachment.sig>

More information about the U-Boot mailing list