[meta-lsi] [PATCH 55/86] u-boot-lsi: Add do_get_tag() compiling task

Daniel Dragomir daniel.dragomir at windriver.com
Wed Oct 29 08:36:03 PDT 2014


From: Paul Butler <paul.butler at windriver.com>

- To get the source tag, add new python function do_get_tag() as
compiling step after do_patch, before do_build.
- Update SRCREV to tag 5.8.1.43 for lsi-v2013.01.01 branch
- Update SRCREV to tag 4.8.1.90 for lsi-v2010.03 branch

Signed-off-by: Paul Butler <paul.butler at windriver.com>
---
 recipes-bsp/u-boot/u-boot-lsi.inc           | 12 ++++++++++++
 recipes-bsp/u-boot/u-boot-lsi_2010.03.bb    |  5 +----
 recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb |  5 ++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-lsi.inc b/recipes-bsp/u-boot/u-boot-lsi.inc
index f8f865a..6ae7f90 100644
--- a/recipes-bsp/u-boot/u-boot-lsi.inc
+++ b/recipes-bsp/u-boot/u-boot-lsi.inc
@@ -32,6 +32,7 @@ SPL_IMAGE = "${SPL_FILE}${UBOOT_EMU}-${MACHINE}-${PV}-${PR}.${SPL_SUFFIX}"
 SPL_SYMLINK = "${SPL_FILE}${UBOOT_EMU}-${MACHINE}.${SPL_SUFFIX}"
 
 do_compile () {
+    export SYSROOT="${STAGING_DIR_TARGET}"
 	if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
 		sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk
 	fi
@@ -83,7 +84,18 @@ do_deploy () {
 
 addtask deploy before do_build after do_compile
 
+python do_get_tag() {
+    import subprocess
+    tag = subprocess.check_output(d.expand("cd ${S}; git describe"), shell=True)
+    bb.note("get_tag returns " + tag)
+    return tag
+}
+
+addtask get_tag after do_patch before do_build
+do_get_tag[nostamp] = "1"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git"
 
+PROVIDES = "virtual/bootloader"
\ No newline at end of file
diff --git a/recipes-bsp/u-boot/u-boot-lsi_2010.03.bb b/recipes-bsp/u-boot/u-boot-lsi_2010.03.bb
index 4105213..44df61b 100644
--- a/recipes-bsp/u-boot/u-boot-lsi_2010.03.bb
+++ b/recipes-bsp/u-boot/u-boot-lsi_2010.03.bb
@@ -3,14 +3,11 @@ require u-boot-lsi.inc
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b"
 
-PROVIDES = "virtual/bootloader"
-
 UBOOT_MACHINE_elpaso = "ACP344xV2_stage3_config"
 
 SPL_BINARY = ""
 
-# This revision corresponds to the tag "lsi_axxia_u-boot_4.8.1.83"
-SRCREV = "lsi_axxia_u-boot_4.8.1.83"
+SRCREV = "lsi_axxia_u-boot_4.8.1.90"
 
 PV = "2010.03+${SRCREV}"
 PR = "r1"
diff --git a/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb b/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb
index ad1474f..b9661ca 100644
--- a/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb
+++ b/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb
@@ -3,14 +3,13 @@ require u-boot-lsi.inc
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
 
-PROVIDES = "virtual/bootloader"
-
 UBOOT_MACHINE_axm5500sim = "axxia-55xx_config"
 UBOOT_MACHINE_axm5500 = "axxia-55xx_config"
 
-SRCREV = "lsi_axxia_u-boot_5.8.1.24"
+SRCREV = "lsi_axxia_u-boot_5.8.1.43"
 
 PV = "2013.01.01+${SRCREV}"
+#PV = "2013.01.01+${@do_get_tag}"
 PR = "r1"
 
 SRC_URI = "git://github.com/lsigithub/lsi_axxia_uboot_public.git"
-- 
1.8.1.4



More information about the meta-lsi mailing list