Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-dey: fix duplicate kernel localversion 

Yocto added kernel local version support by using the KERNEL_LOCALVERSION
variable. It conflicts with the "fsl-kernel-localversion" class from
the meta-freescale layer, resulting in a duplicated local version in the
kernel release label (uname -r). Use the current Yocto support to avoid
that duplication instead of meta-freescale's class.

This enables further simplification of the 'copy_defconfig' task for NXP
and STM platforms using common code.

https://onedigi.atlassian.net/browse/DEL-9669

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2025-06-16 17:41:26 +02:00
parent 0aed6a9c73
commit fcd03fb421
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meta-digi-arm/recipes-kernel/linux/linux-dey.inc
View File

@ -4,7 +4,6 @@ LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
inherit kernel inherit kernel
inherit ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'fsl-kernel-localversion', '', d)}
require ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'recipes-kernel/linux/linux-trustfence.inc', '', d)} require ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'recipes-kernel/linux/linux-trustfence.inc', '', d)}
# CONFIG_KERNEL_LZO in defconfig # CONFIG_KERNEL_LZO in defconfig
@ -18,7 +17,7 @@ SRC_URI = " \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
LOCALVERSION = "-dey" KERNEL_LOCALVERSION = "-dey"
# Create base DTB suitable for overlays # Create base DTB suitable for overlays
OVERLAYS_DTC_FLAGS = "-@" OVERLAYS_DTC_FLAGS = "-@"
@ -43,22 +42,7 @@ do_copy_defconfig () {
cp -f ${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig cp -f ${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig
fi fi
} }
addtask copy_defconfig before do_configure after do_patch
python () {
if d.getVar('DEY_SOC_VENDOR') == "STM":
bb.build.addtask('copy_defconfig', 'do_configure', 'do_patch', d)
elif d.getVar('DEY_SOC_VENDOR') == "NXP":
bb.build.addtask('copy_defconfig', 'do_kernel_localversion', 'do_patch', d)
}
# This is needed because kernel_localversion (in fsl-kernel-localversion.bbclass)
# creates a basic ${B}/.config file and because that file exists, kernel_do_configure
# (in kernel.bbclass) does not apply our defconfig.
do_configure:prepend:imx-nxp-bsp() {
if [ -f "${WORKDIR}/defconfig" ] && [ -f "${B}/.config" ]; then
cat "${WORKDIR}/defconfig" >> "${B}/.config"
fi
}
# Apply configuration fragments # Apply configuration fragments
do_configure:append() { do_configure:append() {