diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2024-08-01 11:34:32 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-01 11:34:32 -0300 |
| commit | 53edaa9dffb89501c223abde946056f99142b759 (patch) | |
| tree | 3ac420e29c55377c73c441c9708c5cd3054cb810 | |
| parent | 5a46df3c737c14c1d421d64e72a101827fcb34a1 (diff) | |
| parent | 3a26a0b27ff574188a4a9433b27890f384c89b82 (diff) | |
| download | meta-freescale-53edaa9dffb89501c223abde946056f99142b759.tar.gz | |
Merge pull request #1888 from pwojtaszczyk-ts/fix_uboot_localversion
Fix uboot localversion
| -rw-r--r-- | classes/fsl-u-boot-localversion.bbclass | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/classes/fsl-u-boot-localversion.bbclass b/classes/fsl-u-boot-localversion.bbclass index 94b30c04e..df4ac5fbf 100644 --- a/classes/fsl-u-boot-localversion.bbclass +++ b/classes/fsl-u-boot-localversion.bbclass | |||
| @@ -17,21 +17,21 @@ UBOOT_LOCALVERSION = "${LOCALVERSION}" | |||
| 17 | do_compile:prepend() { | 17 | do_compile:prepend() { |
| 18 | if [ "${SCMVERSION}" = "y" ]; then | 18 | if [ "${SCMVERSION}" = "y" ]; then |
| 19 | # Add GIT revision to the local version | 19 | # Add GIT revision to the local version |
| 20 | if [ "${SRCREV}" = "INVALID" ]; then | 20 | if [ "${SRCREV}" = "INVALID" ]; then |
| 21 | hash=${SRCREV_machine} | 21 | hash=${SRCREV_machine} |
| 22 | else | 22 | else |
| 23 | hash=${SRCREV} | 23 | hash=${SRCREV} |
| 24 | fi | 24 | fi |
| 25 | if [ "$hash" = "AUTOINC" ]; then | 25 | if [ "$hash" = "AUTOINC" ]; then |
| 26 | branch=`git --git-dir=${S}/.git symbolic-ref --short -q HEAD` | 26 | branch=`git --git-dir=${S}/.git symbolic-ref --short -q HEAD` |
| 27 | head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null` | 27 | head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null` |
| 28 | else | 28 | else |
| 29 | head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null` | 29 | head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null` |
| 30 | fi | 30 | fi |
| 31 | patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null` | 31 | patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null` |
| 32 | printf "%s%s%s%s" +g $head +p $patches > ${S}/.scmversion | 32 | printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${S}/.scmversion |
| 33 | printf "%s%s%s%s" +g $head +p $patches > ${B}/.scmversion | 33 | printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${B}/.scmversion |
| 34 | else | 34 | else |
| 35 | printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion | 35 | printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion |
| 36 | printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion | 36 | printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion |
| 37 | fi | 37 | fi |