From 6ed31afaffb7e94f077b421c61722b6bfc2a340d Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Thu, 13 Feb 2020 22:56:14 +0100 Subject: toradex-kernel-localversion.bbclass: use origin branch set scmversion For kernel-yocto, the commit hash of HEAD is different for every run of do_patch if there is any patch in SRC_URI, this is breaking the recipes that relying on KERNEL_VERSION which contains scmversion, so we should let scmversion stick to the original head instead of the HEAD after do_patch, this will make scmversion stable and hence will make KERNEL_VERSION stable for the recipes that relying on it. Signed-off-by: Ming Liu --- classes/toradex-kernel-localversion.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/classes/toradex-kernel-localversion.bbclass b/classes/toradex-kernel-localversion.bbclass index ce9597c..0892adf 100644 --- a/classes/toradex-kernel-localversion.bbclass +++ b/classes/toradex-kernel-localversion.bbclass @@ -21,7 +21,13 @@ kernel_do_configure_append() { sed -i -e /CONFIG_LOCALVERSION_AUTO/d ${B}/.config if [ "${SCMVERSION}" = "y" ]; then # Add GIT revision to the local version - head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` + if [ -n "${KBRANCH}" ]; then + head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${KBRANCH} 2> /dev/null` + elif [ -n "${SRCBRANCH}" ]; then + head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${SRCBRANCH} 2> /dev/null` + else + head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` + fi printf "+git.%s" $head > ${S}/.scmversion echo "CONFIG_LOCALVERSION_AUTO=y" >> ${B}/.config else -- cgit v1.2.3