diff options
Diffstat (limited to 'classes/toradex-kernel-localversion.bbclass')
| -rw-r--r-- | classes/toradex-kernel-localversion.bbclass | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/classes/toradex-kernel-localversion.bbclass b/classes/toradex-kernel-localversion.bbclass index 319ba96..d17dcd5 100644 --- a/classes/toradex-kernel-localversion.bbclass +++ b/classes/toradex-kernel-localversion.bbclass @@ -4,8 +4,8 @@ # # The following options are supported: # -# SCMVERSION Puts the Git hash in kernel local version -# LOCALVERSION Value used in LOCALVERSION +# SCMVERSION Puts the Git hash in kernel local version +# KERNEL_LOCALVERSION Value used in LOCALVERSION by the oe kernel classes # # Copyright 2014, 2015 (C) O.S. Systems Software LTDA. # Copyright 2019 (C) Toradex AG @@ -14,11 +14,12 @@ inherit toradex-kernel-config TDX_VERSION ??= "0" SCMVERSION ??= "y" -LOCALVERSION ?= "-${TDX_VERSION}" - -kernel_do_configure_append() { - kernel_configure_variable LOCALVERSION "\"${LOCALVERSION}\"" +KERNEL_LOCALVERSION ?= "-${TDX_VERSION}" +# mute the meta-freescale/classes/fsl-kernel-localversion setting, otherwise +# with latest master we get -${TDX_VERSION} twice in the resulting version. +LINUX_VERSION_EXTENSION = "" +kernel_do_configure:append() { if [ "${SCMVERSION}" = "y" ]; then # Add GIT revision to the local version # SRCREV_machine is used in kernel recipes using kernel-yocto.bbclass, |