From d70db23d8fc23218039973fd5df597a8bd44657e Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 5 Mar 2020 13:27:07 +0100 Subject: toradex-kernel-localversion.bbclass: fix set scmversion with autorev Handle the case where SRCREV is set to AUTOREV. fixes: f22318f toradex-kernel-localversion.bbclass: use SRCREV to set scmversion Related-to: TOR-694 Signed-off-by: Max Krummenacher (cherry picked from commit 3e645e66daea9951a02b9de0f52864a79389e23a) --- classes/toradex-kernel-localversion.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/classes/toradex-kernel-localversion.bbclass b/classes/toradex-kernel-localversion.bbclass index 6792d18..766bd0a 100644 --- a/classes/toradex-kernel-localversion.bbclass +++ b/classes/toradex-kernel-localversion.bbclass @@ -23,6 +23,9 @@ kernel_do_configure_append() { # Add GIT revision to the local version if [ -n "${SRCREV_machine}" -a "${SRCREV_machine}" != "INVALID" ]; then head=`git --git-dir=${S}/.git rev-parse --verify --short ${SRCREV_machine} 2> /dev/null` + elif [ -n "${SRCREV}" -a "${SRCREV}" = "AUTOINC" ]; then + branch=`git --git-dir=${S}/.git symbolic-ref --short -q HEAD` + head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null` elif [ -n "${SRCREV}" -a "${SRCREV}" != "INVALID" ]; then head=`git --git-dir=${S}/.git rev-parse --verify --short ${SRCREV} 2> /dev/null` else -- cgit v1.2.3