From 566298409408c6103f7a9871bb13ae5449c4fd64 Mon Sep 17 00:00:00 2001 From: Chase Maupin Date: Thu, 11 Apr 2013 08:03:13 -0500 Subject: u-boot: Add UBOOT_LOCALVERSION to control version string * Add a variable called UBOOT_LOCALVERSION which when set will place a version string in the .scmversion file of the u-boot sources. This string will be picked up by the u-boot Makefile and will be appended to the u-boot version. This is done to make it easier to identify what revision of the u-boot sources are being run. For example you can use a setting like the following to add the short commit id to the u-boot version string: UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}" Signed-off-by: Chase Maupin Signed-off-by: Saul Wold --- meta/recipes-bsp/u-boot/u-boot.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'meta') diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index ae53b9019c..6bbe457dfa 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -16,6 +16,11 @@ python () { raise bb.parse.SkipPackage("because UBOOT_MACHINE is not set") } +# Allow setting an additional version string that will be picked up by the +# u-boot build system and appended to the u-boot version. If the .scmversion +# file already exists it will not be overwritten. +UBOOT_LOCALVERSION ?= "" + # Some versions of u-boot use .bin and others use .img. By default use .bin # but enable individual recipes to change this value. UBOOT_SUFFIX ?= "bin" @@ -40,6 +45,13 @@ do_compile () { unset LDFLAGS unset CFLAGS unset CPPFLAGS + + if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ] + then + echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion + echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion + fi + oe_runmake ${UBOOT_MACHINE} oe_runmake ${UBOOT_MAKE_TARGET} } -- cgit 1.2.3-korg