[OE-core] [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info

[Koen Kooi]

Op 28 jun 2011, om 07:37 heeft Dexuan Cui het volgende geschreven:

> Signed-off-by: Dexuan Cui <dexuan.cui at intel.com>
> ---
> meta/classes/base.bbclass |   14 +++++++++++++-
> 1 files changed, 13 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index 119b052..4766c77 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -165,9 +165,21 @@ python base_eventhandler() {
> 			note(msg)
> 
> 	if name.startswith("BuildStarted"):
> +		corebase = data.getVar("COREBASE", e.data, 1)
> +		corelayers = [corebase + "/meta", corebase + "/meta-yocto"]
> +		layers = (data.getVar("BBLAYERS", e.data, 1) or "").split()
> +		layers = [i for i in layers if i not in corelayers]
> +		fmt_str = "%-27s = \"%s\""
> +		layer_branches = [fmt_str % (os.path.basename(i)+"_BRANCH", \
> +			base_get_metadata_git_branch(i, None).strip()) for i in layers]
> +		layer_revisions = [fmt_str % (os.path.basename(i)+"_REVISION", \
> +			base_get_metadata_git_revision(i, None)) for i in layers]
> 		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']
> -		statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
> +		statuslines = [fmt_str % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
> +		for i in range(len(layer_branches)):
> +			statuslines.insert(3+2*i, layer_branches[i])
> +			statuslines.insert(3+2*i+1, layer_revisions[i])
> 		statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines)
> 		print statusmsg

I tried this patch and I get:

OE Build Configuration:
BB_VERSION                  = "1.13.1"
METADATA_BRANCH             = "master"
METADATA_REVISION           = "364ca0d2d0399c8cc6d3b3fc28308e1e14673544"
meta-angstrom_BRANCH        = "master"
meta-angstrom_REVISION      = "c19c342c62416752117c2dce4696840bc864f647"
meta-oe_BRANCH              = "master"
meta-oe_REVISION            = "9e3f9dddd2d498a603c0e9eb8bf77d3476a21940"
meta-efl_BRANCH             = "master"
meta-efl_REVISION           = "9e3f9dddd2d498a603c0e9eb8bf77d3476a21940"
meta-gpe_BRANCH             = "master"
meta-gpe_REVISION           = "9e3f9dddd2d498a603c0e9eb8bf77d3476a21940"
meta-gnome_BRANCH           = "master"
meta-gnome_REVISION         = "9e3f9dddd2d498a603c0e9eb8bf77d3476a21940"
meta-texasinstruments_BRANCH = "master"
meta-texasinstruments_REVISION = "04f274735bfc4aab757d25490df52641523bad5e"
meta-efikamx_BRANCH         = "master"
meta-efikamx_REVISION       = "70cff8742d629fd32463e3ef1bddb83f04d08dc5"
meta-nslu2_BRANCH           = "master"
meta-nslu2_REVISION         = "aaf918b85d7a8155d6e7c0ff042808346998fbea"
meta-htc_BRANCH             = "master"
meta-htc_REVISION           = "f37d05ca7450f85642cea0e43a75df10663bd8f6"
meta-nokia_BRANCH           = "master"
meta-nokia_REVISION         = "f37d05ca7450f85642cea0e43a75df10663bd8f6"
meta-openmoko_BRANCH        = "master"
meta-openmoko_REVISION      = "f37d05ca7450f85642cea0e43a75df10663bd8f6"
meta-palm_BRANCH            = "master"
meta-palm_REVISION          = "f37d05ca7450f85642cea0e43a75df10663bd8f6"
meta-zaurus_BRANCH          = "master"
meta-zaurus_REVISION        = "f37d05ca7450f85642cea0e43a75df10663bd8f6"
meta-sugarbay_BRANCH        = "master"
meta-sugarbay_REVISION      = "50661bf038a34702f3aa139c3ea0d67fbb0ce5db"
meta-crownbay_BRANCH        = "master"
meta-crownbay_REVISION      = "50661bf038a34702f3aa139c3ea0d67fbb0ce5db"
meta-emenlow_BRANCH         = "master"
meta-emenlow_REVISION       = "50661bf038a34702f3aa139c3ea0d67fbb0ce5db"
meta-fishriver_BRANCH       = "master"
meta-fishriver_REVISION     = "50661bf038a34702f3aa139c3ea0d67fbb0ce5db"
meta-jasperforest_BRANCH    = "master"
meta-jasperforest_REVISION  = "50661bf038a34702f3aa139c3ea0d67fbb0ce5db"
meta-n450_BRANCH            = "master"
meta-n450_REVISION          = "50661bf038a34702f3aa139c3ea0d67fbb0ce5db"
meta-ettus_BRANCH           = "master"
meta-ettus_REVISION         = "c34c30fa29f7ab484cc90efb9713325da8e01460"
meta-openpandora_BRANCH     = "master"
meta-openpandora_REVISION   = "edaf6e751f873ed7a82c1116d3d58b9a070052dc"
meta-archos_BRANCH          = "master"
meta-archos_REVISION        = "413933fb5f62574e38a9a1e38905ba6e9c1be4ad"
TARGET_ARCH                 = "arm"
TARGET_OS                   = "linux-gnueabi"
MACHINE                     = "beagleboard"
DISTRO                      = "angstrom"
DISTRO_VERSION              = "v2011.06-core"
TARGET_FPU                  = "hard"

So it works as expected, but the output is a bit confusing. I have a few (conflicting) suggestions:

1) replace _BRANCH and _REVISION with ' branch' and ' revision', e.g.:

	meta-archos branch          = "master"
	meta-archos revision        = "413933fb5f62574e38a9a1e38905ba6e9c1be4ad"

2) for the extra layers put branch and revision on a single line:

	meta-archos          = "master/413933fb5f62574e38a9a1e38905ba6e9c1be4ad"

3) Move the revision info down, e..g

OE Build Configuration:
BB_VERSION                  = "1.13.1"
TARGET_ARCH                 = "arm"
TARGET_OS                   = "linux-gnueabi"
MACHINE                     = "beagleboard"
DISTRO                      = "angstrom"
DISTRO_VERSION              = "v2011.06-core"
TARGET_FPU                  = "hard"
METADATA_BRANCH             = "master"
METADATA_REVISION           = "364ca0d2d0399c8cc6d3b3fc28308e1e14673544"
meta-angstrom_BRANCH        = "master"
meta-angstrom_REVISION      = "c19c342c62416752117c2dce4696840bc864f647"

etc.

What do you think about that?

regards,

Koen