From 79e5bcecbc596a78f6dd08d96c10566a2eaf40ce Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Wed, 28 Feb 2024 13:28:44 -0600 Subject: linux-ti-staging: Update KERNEL_LOCALVERSION The use of KERNEL_LOCALVERSION for controlling the kernel version has changed recently. Placing the value of KERNEL_LOCALVERSION in .scmversion was causing it to duplicate the string in the final version. Instead, drop KERNEL_LOCALVERSION to just identify that it comes from TI, and that it is an RT kernel. Additionally, place the commit sha for the kernel into the .scmversion file explicitly to be both backward and forward compatible. Signed-off-by: Ryan Eatmon --- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb | 2 ++ meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb index e78707f4..b7426aff 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb @@ -1,5 +1,7 @@ require linux-ti-staging_6.1.bb +KERNEL_LOCALVERSION:append = "-rt" + # Look in the generic major.minor directory for files # This will have priority over generic non-rt path FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" diff --git a/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc b/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc index df7d9ac8..8da90c79 100644 --- a/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc +++ b/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc @@ -1,6 +1,4 @@ -# KERNEL_LOCALVERSION can be set to add a tag to the end of the -# kernel version string. such as the commit id -KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).replace('AUTOINC+','')[:10]}" +KERNEL_LOCALVERSION = "-ti" # Check the defconfig file and see if it points to an in kernel # defconfig that should be used, or if it is a complete config file @@ -13,8 +11,10 @@ do_configure() { # tree config cp ${WORKDIR}/defconfig ${B}/.config - echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion - echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion + scm_version=$(printf '%s%s' -g $(git -C ${S} rev-parse --verify HEAD 2>/dev/null | cut -c1-12)) + + echo ${scm_version} > ${B}/.scmversion + echo ${scm_version} > ${S}/.scmversion # Zero, when using "tisdk" configs, pass control to defconfig_builder config=`cat ${B}/.config | grep use-tisdk-config | cut -d= -f2` -- cgit v1.2.3-54-g00ecf