* [PATCH 0/1] base.bbclass: show layer's branches/revisions in the banner info @ 2011-06-28 5:37 Dexuan Cui 2011-06-28 5:37 ` [PATCH 1/1] " Dexuan Cui 0 siblings, 1 reply; 19+ messages in thread From: Dexuan Cui @ 2011-06-28 5:37 UTC (permalink / raw) To: openembedded-core, paul.eggleton 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 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/banner Dexuan Cui (1): base.bbclass: show layer's branches/revisions in the banner info meta/classes/base.bbclass | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) -- 1.7.4.1 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-28 5:37 [PATCH 0/1] base.bbclass: show layer's branches/revisions in the banner info Dexuan Cui @ 2011-06-28 5:37 ` Dexuan Cui 2011-06-28 6:45 ` Koen Kooi 0 siblings, 1 reply; 19+ messages in thread From: Dexuan Cui @ 2011-06-28 5:37 UTC (permalink / raw) To: openembedded-core, paul.eggleton Signed-off-by: Dexuan Cui <dexuan.cui@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 -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-28 5:37 ` [PATCH 1/1] " Dexuan Cui @ 2011-06-28 6:45 ` Koen Kooi 2011-06-28 11:07 ` Paul Eggleton 2011-06-28 14:27 ` Mark Hatle 0 siblings, 2 replies; 19+ messages in thread From: Koen Kooi @ 2011-06-28 6:45 UTC (permalink / raw) To: Patches and discussions about the oe-core layer; +Cc: paul.eggleton Op 28 jun 2011, om 07:37 heeft Dexuan Cui het volgende geschreven: > Signed-off-by: Dexuan Cui <dexuan.cui@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 ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-28 6:45 ` Koen Kooi @ 2011-06-28 11:07 ` Paul Eggleton 2011-06-29 1:01 ` Khem Raj 2011-06-28 14:27 ` Mark Hatle 1 sibling, 1 reply; 19+ messages in thread From: Paul Eggleton @ 2011-06-28 11:07 UTC (permalink / raw) To: openembedded-core; +Cc: Koen Kooi On Tuesday 28 June 2011 07:45:09 Koen Kooi wrote: > 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" I'd go with option 2 over 1, personally - the list gets rather long on something like Angstrom, better to keep it short. > 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? Sounds good to me. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-28 11:07 ` Paul Eggleton @ 2011-06-29 1:01 ` Khem Raj 2011-06-29 16:14 ` Cui, Dexuan 0 siblings, 1 reply; 19+ messages in thread From: Khem Raj @ 2011-06-29 1:01 UTC (permalink / raw) To: openembedded-core On 06/28/2011 04:07 AM, Paul Eggleton wrote: > On Tuesday 28 June 2011 07:45:09 Koen Kooi wrote: >> 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" > > I'd go with option 2 over 1, personally - the list gets rather long on > something like Angstrom, better to keep it short. I would say to do it uniformly and treat oe-core as one of layers too when emitting this info ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-29 1:01 ` Khem Raj @ 2011-06-29 16:14 ` Cui, Dexuan 2011-06-29 16:19 ` Koen Kooi 0 siblings, 1 reply; 19+ messages in thread From: Cui, Dexuan @ 2011-06-29 16:14 UTC (permalink / raw) To: 'Patches and discussions about the oe-core layer' Khem Raj wrote: > On 06/28/2011 04:07 AM, Paul Eggleton wrote: >> On Tuesday 28 June 2011 07:45:09 Koen Kooi wrote: >>> 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" >> >> I'd go with option 2 over 1, personally - the list gets rather long >> on something like Angstrom, better to keep it short. > > I would say to do it uniformly and treat oe-core as one of layers too > when emitting this info Ok. I'll make a new version for this. BTW: meta and mete-yocto belong to the same git repo actually, so do you think showing them in one line like this meta,meta-yocto = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" is better than showing 2 lines like this: meta = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" meta-yocto = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" ? Thanks, -- Dexuan ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-29 16:14 ` Cui, Dexuan @ 2011-06-29 16:19 ` Koen Kooi 2011-06-29 16:44 ` Cui, Dexuan 0 siblings, 1 reply; 19+ messages in thread From: Koen Kooi @ 2011-06-29 16:19 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 29 jun 2011, om 18:14 heeft Cui, Dexuan het volgende geschreven: > Khem Raj wrote: >> On 06/28/2011 04:07 AM, Paul Eggleton wrote: >>> On Tuesday 28 June 2011 07:45:09 Koen Kooi wrote: >>>> 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" >>> >>> I'd go with option 2 over 1, personally - the list gets rather long >>> on something like Angstrom, better to keep it short. >> >> I would say to do it uniformly and treat oe-core as one of layers too >> when emitting this info > Ok. I'll make a new version for this. > BTW: meta and mete-yocto belong to the same git repo actually, so do you think showing them in one line like this > > meta,meta-yocto = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" > > is better than showing 2 lines like this: > > meta = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" > meta-yocto = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" That breaks with repos like meta-intel and meta-oe. Maybe something like this: BB_VERSION = "1.13.2" TARGET_ARCH = "arm" TARGET_OS = "linux-gnueabi" MACHINE = "archosa32" DISTRO = "angstrom" DISTRO_VERSION = "v2011.06-core" TARGET_FPU = "hard" METADATA_BRANCH = "master" METADATA_REVISION = "16f84804cfbe472833ff00bfd2694947eabf8e20" meta-angstrom = "master:fd68a073e9669fdee0a9dc0483b3d39d3e3e0b46" meta-oe = "master:8a12ecca32766ecdceb72cae76e93f8aadcf3669" meta-efl same meta-gpe same meta-gnome same meta-texasinstruments = "master:2e16e2fbd93bc00bc0a0afaf86975da7778eaa43" meta-efikamx = "master:70cff8742d629fd32463e3ef1bddb83f04d08dc5" meta-nslu2 = "master:aaf918b85d7a8155d6e7c0ff042808346998fbea" meta-htc = "master:f37d05ca7450f85642cea0e43a75df10663bd8f6" meta-nokia same meta-openmoko same meta-palm same meta-zaurus same meta-sugarbay = "master:50661bf038a34702f3aa139c3ea0d67fbb0ce5db" meta-crownbay same meta-emenlow same meta-fishriver same meta-jasperforest same meta-n450 same meta-ettus = "master:c34c30fa29f7ab484cc90efb9713325da8e01460" meta-openpandora = "master:edaf6e751f873ed7a82c1116d3d58b9a070052dc" meta-archos = "master:4b689944d968b0ef4d0e9928e76c54f8a76a919a" regards, Koen ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-29 16:19 ` Koen Kooi @ 2011-06-29 16:44 ` Cui, Dexuan 2011-06-29 18:32 ` Khem Raj 2011-06-29 21:16 ` Koen Kooi 0 siblings, 2 replies; 19+ messages in thread From: Cui, Dexuan @ 2011-06-29 16:44 UTC (permalink / raw) To: 'Patches and discussions about the oe-core layer' Cc: 'Koen Kooi' Koen Kooi wrote: > Op 29 jun 2011, om 18:14 heeft Cui, Dexuan het volgende geschreven: > >> Khem Raj wrote: >>> On 06/28/2011 04:07 AM, Paul Eggleton wrote: >>>> On Tuesday 28 June 2011 07:45:09 Koen Kooi wrote: >> BTW: meta and mete-yocto belong to the same git repo actually, so do >> you think showing them in one line like this >> >> meta,meta-yocto = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" >> >> is better than showing 2 lines like this: >> >> meta = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" >> meta-yocto = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" > > That breaks with repos like meta-intel and meta-oe. Maybe something Could you please explain a bit more? > like this: > > METADATA_BRANCH = "master" > METADATA_REVISION = > "16f84804cfbe472833ff00bfd2694947eabf8e20" meta-angstrom > = "master:fd68a073e9669fdee0a9dc0483b3d39d3e3e0b46" meta-oe > = "master:8a12ecca32766ecdceb72cae76e93f8aadcf3669" meta-efl > same > meta-gpe same > meta-gnome same > meta-texasinstruments = > "master:2e16e2fbd93bc00bc0a0afaf86975da7778eaa43" meta-efikamx > = "master:70cff8742d629fd32463e3ef1bddb83f04d08dc5" meta-nslu2 > = "master:aaf918b85d7a8155d6e7c0ff042808346998fbea" meta-htc > = "master:f37d05ca7450f85642cea0e43a75df10663bd8f6" meta-nokia > same > meta-openmoko same > meta-palm same > meta-zaurus same > meta-sugarbay = > "master:50661bf038a34702f3aa139c3ea0d67fbb0ce5db" meta-crownbay > same > meta-emenlow same > meta-fishriver same > meta-jasperforest same > meta-n450 same > meta-ettus = > "master:c34c30fa29f7ab484cc90efb9713325da8e01460" meta-openpandora > = "master:edaf6e751f873ed7a82c1116d3d58b9a070052dc" meta-archos > = "master:4b689944d968b0ef4d0e9928e76c54f8a76a919a" I think the below is a better format(but the line may be too long?)? meta,meta-yocto = "master:16f84804cfbe472833ff00bfd2694947eabf8e20" meta-angstrom = "master:fd68a073e9669fdee0a9dc0483b3d39d3e3e0b46" meta-oe,meta-efl,meta-gpe,meta-gnome = "master:8a12ecca32766ecdceb72cae76e93f8aadcf3669" meta-texasinstruments = "master:2e16e2fbd93bc00bc0a0afaf86975da7778eaa43" meta-efikamx = "master:70cff8742d629fd32463e3ef1bddb83f04d08dc5" meta-nslu2 = "master:aaf918b85d7a8155d6e7c0ff042808346998fbea" meta-htc,meta-nokia,meta-openmoko,meta-palm,meta,zaurus = "master:f37d05ca7450f85642cea0e43a75df10663bd8f6" meta-sugarbay,meta-crownbay,meta-emenlow,meta-fishriver,meta-jasperforest,meta-n450, = "master:50661bf038a34702f3aa139c3ea0d67fbb0ce5db" meta-ettus = "master:c34c30fa29f7ab484cc90efb9713325da8e01460" meta-openpandora = "master:edaf6e751f873ed7a82c1116d3d58b9a070052dc" meta-archos = "master:4b689944d968b0ef4d0e9928e76c54f8a76a919a" Thanks, -- Dexuan ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-29 16:44 ` Cui, Dexuan @ 2011-06-29 18:32 ` Khem Raj 2011-06-29 21:16 ` Koen Kooi 1 sibling, 0 replies; 19+ messages in thread From: Khem Raj @ 2011-06-29 18:32 UTC (permalink / raw) To: Patches and discussions about the oe-core layer; +Cc: 'Koen Kooi' On (30/06/11 00:44), Cui, Dexuan wrote: > Koen Kooi wrote: > > Op 29 jun 2011, om 18:14 heeft Cui, Dexuan het volgende geschreven: > > > >> Khem Raj wrote: > >>> On 06/28/2011 04:07 AM, Paul Eggleton wrote: > >>>> On Tuesday 28 June 2011 07:45:09 Koen Kooi wrote: > >> BTW: meta and mete-yocto belong to the same git repo actually, so do > >> you think showing them in one line like this > >> > >> meta,meta-yocto = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" > >> > >> is better than showing 2 lines like this: > >> > >> meta = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" > >> meta-yocto = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" > > > > That breaks with repos like meta-intel and meta-oe. Maybe something > Could you please explain a bit more? > > > like this: > > > > METADATA_BRANCH = "master" > > METADATA_REVISION = > > "16f84804cfbe472833ff00bfd2694947eabf8e20" meta-angstrom > > = "master:fd68a073e9669fdee0a9dc0483b3d39d3e3e0b46" meta-oe > > = "master:8a12ecca32766ecdceb72cae76e93f8aadcf3669" meta-efl > > same > > meta-gpe same > > meta-gnome same > > meta-texasinstruments = > > "master:2e16e2fbd93bc00bc0a0afaf86975da7778eaa43" meta-efikamx > > = "master:70cff8742d629fd32463e3ef1bddb83f04d08dc5" meta-nslu2 > > = "master:aaf918b85d7a8155d6e7c0ff042808346998fbea" meta-htc > > = "master:f37d05ca7450f85642cea0e43a75df10663bd8f6" meta-nokia > > same > > meta-openmoko same > > meta-palm same > > meta-zaurus same > > meta-sugarbay = > > "master:50661bf038a34702f3aa139c3ea0d67fbb0ce5db" meta-crownbay > > same > > meta-emenlow same > > meta-fishriver same > > meta-jasperforest same > > meta-n450 same > > meta-ettus = > > "master:c34c30fa29f7ab484cc90efb9713325da8e01460" meta-openpandora > > = "master:edaf6e751f873ed7a82c1116d3d58b9a070052dc" meta-archos > > = "master:4b689944d968b0ef4d0e9928e76c54f8a76a919a" > I think the below is a better format(but the line may be too long?)? You could list the layers line by line and then = "rev" after the last layer from same repo > meta,meta-yocto = "master:16f84804cfbe472833ff00bfd2694947eabf8e20" > meta-angstrom = "master:fd68a073e9669fdee0a9dc0483b3d39d3e3e0b46" > meta-oe,meta-efl,meta-gpe,meta-gnome = "master:8a12ecca32766ecdceb72cae76e93f8aadcf3669" > meta-texasinstruments = "master:2e16e2fbd93bc00bc0a0afaf86975da7778eaa43" > meta-efikamx = "master:70cff8742d629fd32463e3ef1bddb83f04d08dc5" > meta-nslu2 = "master:aaf918b85d7a8155d6e7c0ff042808346998fbea" > meta-htc,meta-nokia,meta-openmoko,meta-palm,meta,zaurus = "master:f37d05ca7450f85642cea0e43a75df10663bd8f6" > meta-sugarbay,meta-crownbay,meta-emenlow,meta-fishriver,meta-jasperforest,meta-n450, = "master:50661bf038a34702f3aa139c3ea0d67fbb0ce5db" > meta-ettus = "master:c34c30fa29f7ab484cc90efb9713325da8e01460" > meta-openpandora = "master:edaf6e751f873ed7a82c1116d3d58b9a070052dc" > meta-archos = "master:4b689944d968b0ef4d0e9928e76c54f8a76a919a" > > Thanks, > -- Dexuan > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- -Khem ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-29 16:44 ` Cui, Dexuan 2011-06-29 18:32 ` Khem Raj @ 2011-06-29 21:16 ` Koen Kooi 1 sibling, 0 replies; 19+ messages in thread From: Koen Kooi @ 2011-06-29 21:16 UTC (permalink / raw) To: Cui, Dexuan; +Cc: 'Patches and discussions about the oe-core layer' Op 29 jun 2011, om 18:44 heeft Cui, Dexuan het volgende geschreven: > Koen Kooi wrote: >> Op 29 jun 2011, om 18:14 heeft Cui, Dexuan het volgende geschreven: >> >>> Khem Raj wrote: >>>> On 06/28/2011 04:07 AM, Paul Eggleton wrote: >>>>> On Tuesday 28 June 2011 07:45:09 Koen Kooi wrote: >>> BTW: meta and mete-yocto belong to the same git repo actually, so do >>> you think showing them in one line like this >>> >>> meta,meta-yocto = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" >>> >>> is better than showing 2 lines like this: >>> >>> meta = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" >>> meta-yocto = "master:2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" >> >> That breaks with repos like meta-intel and meta-oe. Maybe something > Could you please explain a bit more? That will become very wide with meta-intel and meta-oe and friends. I know my terminals are >200 chars wide, but not everyone is weird that way :) Just look at the line below: > meta-sugarbay,meta-crownbay,meta-emenlow,meta-fishriver,meta-jasperforest,meta-n450, = "master:50661bf038a34702f3aa139c3ea0d67fbb0ce5db" ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-28 6:45 ` Koen Kooi 2011-06-28 11:07 ` Paul Eggleton @ 2011-06-28 14:27 ` Mark Hatle 2011-06-28 14:52 ` Cui, Dexuan 2011-06-28 15:13 ` Koen Kooi 1 sibling, 2 replies; 19+ messages in thread From: Mark Hatle @ 2011-06-28 14:27 UTC (permalink / raw) To: openembedded-core On 6/28/11 1:45 AM, Koen Kooi wrote: > > Op 28 jun 2011, om 07:37 heeft Dexuan Cui het volgende geschreven: > >> Signed-off-by: Dexuan Cui <dexuan.cui@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" ... > 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? I think my preference is either 3 or a combination of 2 & 3. To me the important bits are the configuration settings, followed by the components that are being used as a secondary concern. It will all help in debugging and issue, but if the target/distro isn't correct then it doesn't matter what the rest is. --Mark > regards, > > Koen > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-28 14:27 ` Mark Hatle @ 2011-06-28 14:52 ` Cui, Dexuan 2011-06-28 15:10 ` Koen Kooi 2011-06-28 15:13 ` Koen Kooi 1 sibling, 1 reply; 19+ messages in thread From: Cui, Dexuan @ 2011-06-28 14:52 UTC (permalink / raw) To: 'Patches and discussions about the oe-core layer' Cc: 'Paul Eggleton', 'Koen Kooi' Mark Hatle wrote: > On 6/28/11 1:45 AM, Koen Kooi wrote: >> >> Op 28 jun 2011, om 07:37 heeft Dexuan Cui het volgende geschreven: >> >> ....... >> 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? > > I think my preference is either 3 or a combination of 2 & 3. > > To me the important bits are the configuration settings, followed by > the components that are being used as a secondary concern. It will > all help in debugging and issue, but if the target/distro isn't > correct then it doesn't matter what the rest is. > > --Mark > Hi, thank you very much for the suggestions! I worked out a vesion 2 patch that combines 2 and 3: http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/banner_v2&id=2c2d9d7c0e942b6748bc8bd7d5980113bae9a836 Please note I use a colon mark rather than a slash mark for better readabability since a branch name can contain colon. An output result in my side is: OE Build Configuration: BB_VERSION = "1.13.1" TARGET_ARCH = "i586" TARGET_OS = "linux" MACHINE = "qemux86" DISTRO = "poky" DISTRO_VERSION = "1.0+snapshot-20110628" TARGET_FPU = "" METADATA_BRANCH = "dcui/banner_v2" METADATA_REVISION = "2c2d9d7c0e942b6748bc8bd7d5980113bae9a836" meta-sugarbay = "dcui/test1:76d1178ba1a43cf6457c89717134aeb9f1275fae" Please let me know if this new output looks ok. BTW, Koen, even with this v2 patch, the list looks still pretty long in your side. I noticed there are some layers with the same revision: e.g., 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" I guess they actually belong to the same repo. In this case, maybe we can further improve the output format to: meta-htc,nokia,openmoko,palm,zaurus:f37d05ca7450f85642cea0e43a75df10663bd8f6 ? Thanks, -- Dexuan ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-28 14:52 ` Cui, Dexuan @ 2011-06-28 15:10 ` Koen Kooi 2011-06-28 15:21 ` Cui, Dexuan 0 siblings, 1 reply; 19+ messages in thread From: Koen Kooi @ 2011-06-28 15:10 UTC (permalink / raw) To: Cui, Dexuan Cc: 'Paul Eggleton', 'Patches and discussions about the oe-core layer' Op 28 jun 2011, om 16:52 heeft Cui, Dexuan het volgende geschreven: > Mark Hatle wrote: >> On 6/28/11 1:45 AM, Koen Kooi wrote: >>> >>> Op 28 jun 2011, om 07:37 heeft Dexuan Cui het volgende geschreven: >>> >>> ....... >>> 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? >> >> I think my preference is either 3 or a combination of 2 & 3. >> >> To me the important bits are the configuration settings, followed by >> the components that are being used as a secondary concern. It will >> all help in debugging and issue, but if the target/distro isn't >> correct then it doesn't matter what the rest is. >> >> --Mark >> > > Hi, thank you very much for the suggestions! > I worked out a vesion 2 patch that combines 2 and 3: > http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/banner_v2&id=2c2d9d7c0e942b6748bc8bd7d5980113bae9a836 Could you in the future please base them on oe-core instead of poky? I just did 'git merge 2c2d9d7c0e942b6748bc8bd7d5980113bae9a836' and git blew up. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-28 15:10 ` Koen Kooi @ 2011-06-28 15:21 ` Cui, Dexuan 2011-06-28 15:24 ` Phil Blundell 2011-06-28 15:33 ` Mark Hatle 0 siblings, 2 replies; 19+ messages in thread From: Cui, Dexuan @ 2011-06-28 15:21 UTC (permalink / raw) To: 'Koen Kooi' Cc: 'Patches and discussions about the oe-core layer' Koen Kooi wrote: > Op 28 jun 2011, om 16:52 heeft Cui, Dexuan het volgende geschreven: > >> Hi, thank you very much for the suggestions! >> I worked out a vesion 2 patch that combines 2 and 3: >> http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/banner_v2&id=2c2d9d7c0e942b6748bc8bd7d5980113bae9a836 > > Could you in the future please base them on oe-core instead of poky? > I just did 'git merge 2c2d9d7c0e942b6748bc8bd7d5980113bae9a836' and > git blew up. Sorry... but to basing them on oe-core, do I need the permission to push my commits to my own branch in git://git.openembedded.org/openembedded-core-contrib? I suppose so and I should put my public key somewhere into the server? Thanks, -- Dexuan ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-28 15:21 ` Cui, Dexuan @ 2011-06-28 15:24 ` Phil Blundell 2011-06-28 15:33 ` Mark Hatle 1 sibling, 0 replies; 19+ messages in thread From: Phil Blundell @ 2011-06-28 15:24 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, 2011-06-28 at 23:21 +0800, Cui, Dexuan wrote: > Sorry... but to basing them on oe-core, do I need the permission to push my commits to my own branch in git://git.openembedded.org/openembedded-core-contrib? I suppose so and I should put my public key somewhere into the server? You don't need to do that. You can just make a repo on github or gitorious (or your own server, or even one of the yocto hosts) and clone oe-core into it. p. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-28 15:21 ` Cui, Dexuan 2011-06-28 15:24 ` Phil Blundell @ 2011-06-28 15:33 ` Mark Hatle 2011-06-28 15:45 ` Cui, Dexuan 2011-06-28 15:51 ` Koen Kooi 1 sibling, 2 replies; 19+ messages in thread From: Mark Hatle @ 2011-06-28 15:33 UTC (permalink / raw) To: openembedded-core On 6/28/11 10:21 AM, Cui, Dexuan wrote: > Koen Kooi wrote: >> Op 28 jun 2011, om 16:52 heeft Cui, Dexuan het volgende geschreven: >> >>> Hi, thank you very much for the suggestions! >>> I worked out a vesion 2 patch that combines 2 and 3: >>> http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/banner_v2&id=2c2d9d7c0e942b6748bc8bd7d5980113bae9a836 >> >> Could you in the future please base them on oe-core instead of poky? >> I just did 'git merge 2c2d9d7c0e942b6748bc8bd7d5980113bae9a836' and >> git blew up. > Sorry... but to basing them on oe-core, do I need the permission to push my commits to my own branch in git://git.openembedded.org/openembedded-core-contrib? I suppose so and I should put my public key somewhere into the server? You can push oe-core (based) changes to the poky-contrib tree. Many of us do this regularly. I base my changes usually on oe-core, unless they contain poky specific code.. I push both types to the same poky-contrib repository (in different branches of course). (I also always avoid "merge", and always use cherry-pick when pulling code from someone else's branches into my own..) --Mark > Thanks, > -- Dexuan > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-28 15:33 ` Mark Hatle @ 2011-06-28 15:45 ` Cui, Dexuan 2011-06-28 15:51 ` Koen Kooi 1 sibling, 0 replies; 19+ messages in thread From: Cui, Dexuan @ 2011-06-28 15:45 UTC (permalink / raw) To: 'Patches and discussions about the oe-core layer' Mark Hatle wrote: > On 6/28/11 10:21 AM, Cui, Dexuan wrote: >> Koen Kooi wrote: >>> Op 28 jun 2011, om 16:52 heeft Cui, Dexuan het volgende geschreven: >>> >>>> Hi, thank you very much for the suggestions! >>>> I worked out a vesion 2 patch that combines 2 and 3: >>>> http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/banner_v2&id=2c2d9d7c0e942b6748bc8bd7d5980113bae9a836 >>> >>> Could you in the future please base them on oe-core instead of poky? >>> I just did 'git merge 2c2d9d7c0e942b6748bc8bd7d5980113bae9a836' and >>> git blew up. >> Sorry... but to basing them on oe-core, do I need the permission to >> push my commits to my own branch in >> git://git.openembedded.org/openembedded-core-contrib? I suppose so >> and I should put my public key somewhere into the server? > > You can push oe-core (based) changes to the poky-contrib tree. Many > of us do this regularly. > > I base my changes usually on oe-core, unless they contain poky > specific code.. I push both types to the same poky-contrib repository > (in different branches of course). > > (I also always avoid "merge", and always use cherry-pick when pulling > code from someone else's branches into my own..) Thank Mark and Phil a lot for the explanation! I'll base my change to oe-core in future. Thanks, -- Dexuan ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-28 15:33 ` Mark Hatle 2011-06-28 15:45 ` Cui, Dexuan @ 2011-06-28 15:51 ` Koen Kooi 1 sibling, 0 replies; 19+ messages in thread From: Koen Kooi @ 2011-06-28 15:51 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 28 jun 2011, om 17:33 heeft Mark Hatle het volgende geschreven: > On 6/28/11 10:21 AM, Cui, Dexuan wrote: >> Koen Kooi wrote: >>> Op 28 jun 2011, om 16:52 heeft Cui, Dexuan het volgende geschreven: >>> >>>> Hi, thank you very much for the suggestions! >>>> I worked out a vesion 2 patch that combines 2 and 3: >>>> http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/banner_v2&id=2c2d9d7c0e942b6748bc8bd7d5980113bae9a836 >>> >>> Could you in the future please base them on oe-core instead of poky? >>> I just did 'git merge 2c2d9d7c0e942b6748bc8bd7d5980113bae9a836' and >>> git blew up. >> Sorry... but to basing them on oe-core, do I need the permission to push my commits to my own branch in git://git.openembedded.org/openembedded-core-contrib? I suppose so and I should put my public key somewhere into the server? > > You can push oe-core (based) changes to the poky-contrib tree. Many of us do > this regularly. > > I base my changes usually on oe-core, unless they contain poky specific code.. > I push both types to the same poky-contrib repository (in different branches of > course). > > (I also always avoid "merge", and always use cherry-pick when pulling code from > someone else's branches into my own..) I tend to do that as well, but I was paying attention to the yocto phone call instead of the console :) ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info 2011-06-28 14:27 ` Mark Hatle 2011-06-28 14:52 ` Cui, Dexuan @ 2011-06-28 15:13 ` Koen Kooi 1 sibling, 0 replies; 19+ messages in thread From: Koen Kooi @ 2011-06-28 15:13 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 28 jun 2011, om 16:27 heeft Mark Hatle het volgende geschreven: > On 6/28/11 1:45 AM, Koen Kooi wrote: >> >> Op 28 jun 2011, om 07:37 heeft Dexuan Cui het volgende geschreven: >> >>> Signed-off-by: Dexuan Cui <dexuan.cui@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" > ... >> 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? > > I think my preference is either 3 or a combination of 2 & 3. > > To me the important bits are the configuration settings, followed by the > components that are being used as a secondary concern. It will all help in > debugging and issue, but if the target/distro isn't correct then it doesn't > matter what the rest is. The current patch outputs the following: OE Build Configuration: BB_VERSION = "1.13.2" TARGET_ARCH = "arm" TARGET_OS = "linux-gnueabi" MACHINE = "beagleboard" DISTRO = "angstrom" DISTRO_VERSION = "v2011.06-core" TARGET_FPU = "hard" METADATA_BRANCH = "master" METADATA_REVISION = "f1c2bfb82e0d11955cb8dc6b2f7aca9e291e1269" meta-angstrom = "master:a3bb1d65ae008b32a20701f479dea59e8268f806" meta-oe = "master:8a12ecca32766ecdceb72cae76e93f8aadcf3669" meta-efl = "master:8a12ecca32766ecdceb72cae76e93f8aadcf3669" meta-gpe = "master:8a12ecca32766ecdceb72cae76e93f8aadcf3669" meta-gnome = "master:8a12ecca32766ecdceb72cae76e93f8aadcf3669" meta-texasinstruments = "master:2e16e2fbd93bc00bc0a0afaf86975da7778eaa43" meta-efikamx = "master:70cff8742d629fd32463e3ef1bddb83f04d08dc5" meta-nslu2 = "master:aaf918b85d7a8155d6e7c0ff042808346998fbea" meta-htc = "master:f37d05ca7450f85642cea0e43a75df10663bd8f6" meta-nokia = "master:f37d05ca7450f85642cea0e43a75df10663bd8f6" meta-openmoko = "master:f37d05ca7450f85642cea0e43a75df10663bd8f6" meta-palm = "master:f37d05ca7450f85642cea0e43a75df10663bd8f6" meta-zaurus = "master:f37d05ca7450f85642cea0e43a75df10663bd8f6" meta-sugarbay = "master:50661bf038a34702f3aa139c3ea0d67fbb0ce5db" meta-crownbay = "master:50661bf038a34702f3aa139c3ea0d67fbb0ce5db" meta-emenlow = "master:50661bf038a34702f3aa139c3ea0d67fbb0ce5db" meta-fishriver = "master:50661bf038a34702f3aa139c3ea0d67fbb0ce5db" meta-jasperforest = "master:50661bf038a34702f3aa139c3ea0d67fbb0ce5db" meta-n450 = "master:50661bf038a34702f3aa139c3ea0d67fbb0ce5db" meta-ettus = "master:c34c30fa29f7ab484cc90efb9713325da8e01460" meta-openpandora = "master:edaf6e751f873ed7a82c1116d3d58b9a070052dc" meta-archos = "master:413933fb5f62574e38a9a1e38905ba6e9c1be4ad" Still a mouthfull, but easy to digest IMO ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2011-06-29 21:20 UTC | newest] Thread overview: 19+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-06-28 5:37 [PATCH 0/1] base.bbclass: show layer's branches/revisions in the banner info Dexuan Cui 2011-06-28 5:37 ` [PATCH 1/1] " Dexuan Cui 2011-06-28 6:45 ` Koen Kooi 2011-06-28 11:07 ` Paul Eggleton 2011-06-29 1:01 ` Khem Raj 2011-06-29 16:14 ` Cui, Dexuan 2011-06-29 16:19 ` Koen Kooi 2011-06-29 16:44 ` Cui, Dexuan 2011-06-29 18:32 ` Khem Raj 2011-06-29 21:16 ` Koen Kooi 2011-06-28 14:27 ` Mark Hatle 2011-06-28 14:52 ` Cui, Dexuan 2011-06-28 15:10 ` Koen Kooi 2011-06-28 15:21 ` Cui, Dexuan 2011-06-28 15:24 ` Phil Blundell 2011-06-28 15:33 ` Mark Hatle 2011-06-28 15:45 ` Cui, Dexuan 2011-06-28 15:51 ` Koen Kooi 2011-06-28 15:13 ` Koen Kooi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox