diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2020-04-01 14:21:34 +0000 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2020-04-01 14:45:19 +0000 |
| commit | 45bd3b76849449d2b6de2b75e07d49097d5f1dbf (patch) | |
| tree | 965353b7bd44ceed9d1f2b7a752d458d5dffed7a | |
| parent | c6be4ddf709f00546caa534f96cb553b883d1ea3 (diff) | |
toradex-kernel/u-boot-localversion: use fixed length git hash
Make sure the git hash is always 12 characters long. This avoids issues
where we can get different length git hashes between to independent
builds. This can be problematic when sstate is shared.
Related-to: TOR-810
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
| -rw-r--r-- | classes/toradex-kernel-localversion.bbclass | 10 | ||||
| -rw-r--r-- | classes/toradex-u-boot-localversion.bbclass | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/classes/toradex-kernel-localversion.bbclass b/classes/toradex-kernel-localversion.bbclass index e2ec3a0..319ba96 100644 --- a/classes/toradex-kernel-localversion.bbclass +++ b/classes/toradex-kernel-localversion.bbclass @@ -26,18 +26,18 @@ kernel_do_configure_append() { if [ -n "${SRCREV_machine}" ]; then if [ "${SRCREV_machine}" = "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` + head=`git --git-dir=${S}/.git rev-parse --verify --short=12 origin/${branch} 2> /dev/null` else - head=`git --git-dir=${S}/.git rev-parse --verify --short ${SRCREV_machine} 2> /dev/null` + head=`git --git-dir=${S}/.git rev-parse --verify --short=12 ${SRCREV_machine} 2> /dev/null` fi # SRCREV is used by linux-toradex recipes 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` + head=`git --git-dir=${S}/.git rev-parse --verify --short=12 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` + head=`git --git-dir=${S}/.git rev-parse --verify --short=12 ${SRCREV} 2> /dev/null` else - head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` + head=`git --git-dir=${S}/.git rev-parse --verify --short=12 HEAD 2> /dev/null` fi printf "+git.%s" $head > ${S}/.scmversion kernel_configure_variable LOCALVERSION_AUTO y diff --git a/classes/toradex-u-boot-localversion.bbclass b/classes/toradex-u-boot-localversion.bbclass index 153469d..3ad86db 100644 --- a/classes/toradex-u-boot-localversion.bbclass +++ b/classes/toradex-u-boot-localversion.bbclass @@ -19,7 +19,7 @@ UBOOT_LOCALVERSION = "${LOCALVERSION}" do_compile_prepend() { if [ "${SCMVERSION}" = "y" ]; then - head=`cd ${S} ; git rev-parse --verify --short HEAD 2> /dev/null` + head=`cd ${S} ; git rev-parse --verify --short=12 HEAD 2> /dev/null` printf "%s+git.%s" "${UBOOT_LOCALVERSION}" $head > ${S}/.scmversion printf "%s+git.%s" "${UBOOT_LOCALVERSION}" $head > ${B}/.scmversion fi |