summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-03-30 13:43:31 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2015-04-02 22:49:07 -0300
commit1caced0a0ecb028ea0f112cd1e04f126ddff5cfe (patch)
treef595ab307c927a5b2d083a16d42064ca2ca0a8ab /classes
parentd2ebacb41b100c224f189e693076c130b7f360e8 (diff)
downloadmeta-fsl-arm-1caced0a0ecb028ea0f112cd1e04f126ddff5cfe.tar.gz
fsl-kernel-localversion.bbclass: Fix Git hash in version
The .scmversion file needs to be located in the Git source, otherwise the build system does not use it. This fixes the regression introduced in f69b21d (fsl-kernel-localversion.bbclass: Fix building using out-of-tree). Change-Id: I7f06279f5b1f9aee18d1a5a39a22b27f4c34f365 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'classes')
-rw-r--r--classes/fsl-kernel-localversion.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/fsl-kernel-localversion.bbclass b/classes/fsl-kernel-localversion.bbclass
index 6f9eb51..1004e35 100644
--- a/classes/fsl-kernel-localversion.bbclass
+++ b/classes/fsl-kernel-localversion.bbclass
@@ -7,7 +7,7 @@
7# SCMVERSION Puts the Git hash in kernel local version 7# SCMVERSION Puts the Git hash in kernel local version
8# LOCALVERSION Value used in LOCALVERSION (default to '+fslc') 8# LOCALVERSION Value used in LOCALVERSION (default to '+fslc')
9# 9#
10# Copyright 2014 (C) O.S. Systems Software LTDA. 10# Copyright 2014, 2015 (C) O.S. Systems Software LTDA.
11 11
12SCMVERSION ??= "y" 12SCMVERSION ??= "y"
13LOCALVERSION ??= "+fslc" 13LOCALVERSION ??= "+fslc"
@@ -34,6 +34,6 @@ do_configure_prepend() {
34 if [ "${SCMVERSION}" = "y" ]; then 34 if [ "${SCMVERSION}" = "y" ]; then
35 # Add GIT revision to the local version 35 # Add GIT revision to the local version
36 head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` 36 head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null`
37 printf "%s%s" +g $head > ${B}/.scmversion 37 printf "%s%s" +g $head > ${S}/.scmversion
38 fi 38 fi
39} 39}