MIRRORS/meta-freescale
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-freescale.git synced 2026-01-27 11:52:04 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fsl-kernel-localversion: Fix duplicate LOCALVERSION

Browse Source 
The kernel version contains LOCALVERSION twice. For example, for
LOCALVERSION=nxp-next:
```
$ cat tmp/work/imx95evk-poky-linux/linux-imx/6.18.y+git/build/include/generated/utsrelease.h
#define UTS_RELEASE "6.18.0-nxp-next-nxp-next-06195-gb61baedaf5d5"
```

The problem is kernel-yocto.bbclass adds LOCALVERSION via .config if
LINUX_VERSION_EXTENSION is not empty, and the build itself adds it
because fsl-kernel-localversion.bbclass sets CONFIG_LOCALVERSION_AUTO=y
whenever SCMVERSION is enabled.

Fix by clearing LINUX_VERSION_EXTENSION if SCMVERSION is enabled.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
This commit is contained in:
Tom Hochstein 2025-12-15 12:17:10 -06:00
parent 1f1dd28237
commit e6a138da45
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/fsl-kernel-localversion.bbclass
View File

@ -13,7 +13,8 @@ SCMVERSION ??= "y"
LOCALVERSION ??= "+fslc" LOCALVERSION ??= "+fslc"
# LINUX_VERSION_EXTENSION is used as CONFIG_LOCALVERSION by kernel-yocto class # LINUX_VERSION_EXTENSION is used as CONFIG_LOCALVERSION by kernel-yocto class
LINUX_VERSION_EXTENSION ?= "${LOCALVERSION}" LINUX_VERSION_EXTENSION ?= \
"${@bb.utils.contains('SCMVERSION', 'y', '', '${LOCALVERSION}', d)}"
do_kernel_localversion[dirs] += "${S} ${B}" do_kernel_localversion[dirs] += "${S} ${B}"
do_kernel_localversion() { do_kernel_localversion() {