From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Cc: Marek Vasut <marex@denx.de>,
Rasmus Villemoes <rasmus.villemoes@prevas.dk>,
Tom Rini <trini@konsulko.com>
Subject: [PATCH] scripts/setlocalversion: Reinstate .scmversion support
Date: Sun, 2 Mar 2025 19:30:28 +0100 [thread overview]
Message-ID: <20250302183128.326418-1-marex@denx.de> (raw)
The .scmversion is used by oe-core to append U-Boot version string.
LOCALVERSION is not fully compatible replacement as it adds trailing
"-dirty" string at the end of version string in case the U-Boot git
tree contains uncommitted changes. This behavior itself is correct.
However, OE builds do clone U-Boot sources from git and may apply
additional patches on top, which are not tracked in U-Boot git tree,
but rather in the OE metalayer git tree, which leads to the addition
of "-dirty" string as well.
The .scmversion used by oe-core used to replace the version string
suffix fully, including the "-dirty" string. Reinstate support for
the .scmversion to let OE core do exactly that as it used to do it.
Fixes: 5c02350fa03d ("scripts/setlocalversion: sync with linux v6.9")
Signed-off-by: Marek Vasut <marex@denx.de>
---
Cc: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Cc: Tom Rini <trini@konsulko.com>
Cc: u-boot@lists.denx.de
---
scripts/setlocalversion | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index dbe048210d6..26d121816dd 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -48,6 +48,10 @@ scm_version()
done
cd "$srctree"
+ if test -e .scmversion; then
+ cat .scmversion
+ return
+ fi
if test -n "$(git rev-parse --show-cdup 2>/dev/null)"; then
return
--
2.47.2
next reply other threads:[~2025-03-02 18:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-02 18:30 Marek Vasut [this message]
2025-03-04 9:24 ` [PATCH] scripts/setlocalversion: Reinstate .scmversion support Rasmus Villemoes
2025-03-04 14:28 ` Marek Vasut
2025-03-04 14:42 ` Tom Rini
2025-03-04 21:33 ` Rasmus Villemoes
2025-03-05 0:55 ` Marek Vasut
2025-03-05 0:41 ` Marek Vasut
2025-05-29 17:55 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250302183128.326418-1-marex@denx.de \
--to=marex@denx.de \
--cc=rasmus.villemoes@prevas.dk \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox