Skip to contentSkip to conversation

base.bbclass: show layer's branches/revisions in the banner info

PATCH Applied Dexuan Cui 2 participants 3 messages Jul 2, 2011 – Jul 5, 2011

lore
Share & tools
lore

Dexuan Cui

author
#0 lore raw

v3 cover base.bbclass: show layer's branches/revisions in the banner info

The following changes since commit a1f79a7896b6411669b3ccada6204d2695e80fc5:

runqueue.py: Add umask task control (2011-06-24 12:23:12 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dcui/banner_v3
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/banner_v3

Dexuan Cui (1):
base.bbclass: show layer's branches/revisions in the banner info

 meta/classes/base.bbclass |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)
Signature · 1 line
1.7.6
author
#1 lore raw

PATCH v3 1/1 base.bbclass: show layer's branches/revisions in the banner info

The patch removes METADATA_BRANCH and METADATA_REVISION, and treats the meta/ in the same way as other layers.
In the case some layers belonging to the same repo, the branch and revision are only printed once, but all the layer names are still printed.

An example output can be:

OE Build Configuration:

BB_VERSION        = "1.13.1"
TARGET_ARCH       = "i586"
TARGET_OS         = "linux"
MACHINE           = "emenlow"
DISTRO            = "poky"
DISTRO_VERSION    = "1.0+snapshot-20110702"
TARGET_FPU        = ""

meta
meta-yocto = "dcui/banner_v3:4b712dba68a98c827b8f3d0242da9153c4f65473"
meta-emenlow
meta-sugarbay
meta-n450 = "dcui/test1:76d1178ba1a43cf6457c89717134aeb9f1275fae"

Signed-off-by Dexuan Cui <[email protected]>
---
 meta/classes/base.bbclass |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)
meta/classes/base.bbclass +22 -1
index 119b052..87fdb74 100644
@@ -166,8 +166,29 @@ python base_eventhandler() {
 
 	if name.startswith("BuildStarted"):
 		bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
-		statusvars = ['BB_VERSION', 'METADATA_BRANCH', 'METADATA_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU']
+		statusvars = ['BB_VERSION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU']
 		statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
+
+		layers = (data.getVar("BBLAYERS", e.data, 1) or "").split()
+		layers_branch_rev = ["%-17s = \"%s:%s\"" % (os.path.basename(i), \
+			base_get_metadata_git_branch(i, None).strip(), \
+			base_get_metadata_git_revision(i, None)) \
+				for i in layers]
+		i = len(layers_branch_rev)-1
+		p1 = layers_branch_rev[i].find("=")
+		s1= layers_branch_rev[i][p1:]
+		while i > 0:
+			p2 = layers_branch_rev[i-1].find("=")
+			s2= layers_branch_rev[i-1][p2:]
+			if s1 == s2:
+				layers_branch_rev[i-1] = layers_branch_rev[i-1][0:p2]
+				i -= 1
+			else:
+				i -= 1
+				p1 = layers_branch_rev[i].find("=")
+				s1= layers_branch_rev[i][p1:]
+
+		statuslines += layers_branch_rev
 		statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines)
 		print statusmsg
Signature · 1 line
1.7.6
Applied
#2 lore raw
In reply to Dexuan Cui
Quoted 10 lines · Dexuan Cui

The following changes since commit a1f79a7896b6411669b3ccada6204d2695e80fc5:

runqueue.py: Add umask task control (2011-06-24 12:23:12 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dcui/banner_v3
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/banner_v3

Dexuan Cui (1):
base.bbclass: show layer's branches/revisions in the banner info

Merged to master, thanks.

Richard