summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-06-28 13:18:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-05 13:42:50 +0100
commita7a5d5ef6b8cb9a9547cefbd2919b46f1697ce17 (patch)
tree27ec0f7f7efc26fa1ced487606be75f5cb13334b
parent0aa90b1b42173db24b5119b1f72024a9b327b650 (diff)
downloadpoky-a7a5d5ef6b8cb9a9547cefbd2919b46f1697ce17.tar.gz
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" (From OE-Core rev: f271498638a9da271ed5da973666fe4a7bd0ac63) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass23
1 files changed, 22 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index c82dae83e8..0c2c546925 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -166,8 +166,29 @@ python base_eventhandler() {
166 166
167 if name.startswith("BuildStarted"): 167 if name.startswith("BuildStarted"):
168 bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) 168 bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
169 statusvars = ['BB_VERSION', 'METADATA_BRANCH', 'METADATA_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU'] 169 statusvars = ['BB_VERSION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU']
170 statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars] 170 statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
171
172 layers = (data.getVar("BBLAYERS", e.data, 1) or "").split()
173 layers_branch_rev = ["%-17s = \"%s:%s\"" % (os.path.basename(i), \
174 base_get_metadata_git_branch(i, None).strip(), \
175 base_get_metadata_git_revision(i, None)) \
176 for i in layers]
177 i = len(layers_branch_rev)-1
178 p1 = layers_branch_rev[i].find("=")
179 s1= layers_branch_rev[i][p1:]
180 while i > 0:
181 p2 = layers_branch_rev[i-1].find("=")
182 s2= layers_branch_rev[i-1][p2:]
183 if s1 == s2:
184 layers_branch_rev[i-1] = layers_branch_rev[i-1][0:p2]
185 i -= 1
186 else:
187 i -= 1
188 p1 = layers_branch_rev[i].find("=")
189 s1= layers_branch_rev[i][p1:]
190
191 statuslines += layers_branch_rev
171 statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines) 192 statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines)
172 print statusmsg 193 print statusmsg
173 194