diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-03-05 13:27:07 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-03-05 13:52:46 +0100 |
| commit | d70db23d8fc23218039973fd5df597a8bd44657e (patch) | |
| tree | 794a9c088ed8447a865a8e399be8f21583afbfdd | |
| parent | f22318fe5a27258a02a9923629c9b8399b387d92 (diff) | |
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 <max.krummenacher@toradex.com>
(cherry picked from commit 3e645e66daea9951a02b9de0f52864a79389e23a)
| -rw-r--r-- | classes/toradex-kernel-localversion.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
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 |