* [meta-fsl-arm][PATCH] u-boot: Fix out-of-tree builds
@ 2016-08-20 13:57 Gary Thomas
2016-08-22 15:13 ` Otavio Salvador
0 siblings, 1 reply; 2+ messages in thread
From: Gary Thomas @ 2016-08-20 13:57 UTC (permalink / raw)
To: meta-freescale; +Cc: Gary Thomas
Recent changes to the main u-boot recipe builds in a separate tree
which broke the segment of this code that attempts to find the GIT
revision (not in correct directory). This patch adjusts that by
forcing the git command to run in the correct location.
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
classes/fsl-u-boot-localversion.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/classes/fsl-u-boot-localversion.bbclass b/classes/fsl-u-boot-localversion.bbclass
index f7e0971..69a0fd4 100644
--- a/classes/fsl-u-boot-localversion.bbclass
+++ b/classes/fsl-u-boot-localversion.bbclass
@@ -17,7 +17,7 @@ UBOOT_LOCALVERSION = "${LOCALVERSION}"
do_compile_prepend() {
if [ "${SCMVERSION}" = "y" ]; then
# Add GIT revision to the local version
- head=`git rev-parse --verify --short HEAD 2> /dev/null`
+ head=`cd ${S};git rev-parse --verify --short HEAD 2> /dev/null`
printf "%s%s%s" "${UBOOT_LOCALVERSION}" +g $head > ${S}/.scmversion
printf "%s%s%s" "${UBOOT_LOCALVERSION}" +g $head > ${B}/.scmversion
else
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [meta-fsl-arm][PATCH] u-boot: Fix out-of-tree builds
2016-08-20 13:57 [meta-fsl-arm][PATCH] u-boot: Fix out-of-tree builds Gary Thomas
@ 2016-08-22 15:13 ` Otavio Salvador
0 siblings, 0 replies; 2+ messages in thread
From: Otavio Salvador @ 2016-08-22 15:13 UTC (permalink / raw)
To: Gary Thomas; +Cc: meta-freescale
On Sat, Aug 20, 2016 at 10:57 AM, Gary Thomas <gary@mlbassoc.com> wrote:
> Recent changes to the main u-boot recipe builds in a separate tree
> which broke the segment of this code that attempts to find the GIT
> revision (not in correct directory). This patch adjusts that by
> forcing the git command to run in the correct location.
>
> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
I merged the patch I did on Friday to fix; I saw you did the same
change after I had it merged, sorry for that.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-22 15:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-20 13:57 [meta-fsl-arm][PATCH] u-boot: Fix out-of-tree builds Gary Thomas
2016-08-22 15:13 ` Otavio Salvador
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.