On Sun, Mar 02, 2025 at 07:30:28PM +0100, Marek Vasut wrote:
> 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 <ma...@denx.de>So, I've talked with Marek off-list, a lot. We have a few sets of problems, both with U-Boot and with OE. In U-Boot, we don't have the software-clout to force other projects to adapt to our whims, unlike the linux kernel. So as much as I don't like re-introducing this, we need to for a transition window at least their localversion support is just not functioning. But from the U-Boot point of view, we need to get OE (and anyone else out there!) to stop relying on .scmversion. It will go away again. The other problem is OE (and anyone else!) that was relying on this mechanism to patch out "-dirty" and not at the same time provide a meaningful version distinction. This also needs to be fixed in other projects. So with all of that said, I've applied this to u-boot/master now, and in some number of years once whatever OE LTS doesn't rely on this at least, we'll rip it out again. -- Tom
signature.asc
Description: PGP signature
