summaryrefslogtreecommitdiff
path: root/meta/classes/distrodata.bbclass
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-09-20 13:40:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-21 13:27:35 +0100
commitedb2a11994ac21e790155ea519bded4b37ef9307 (patch)
treec64a0b6ffa07626c1318c5c28a19c95f5bd35066 /meta/classes/distrodata.bbclass
parent924d2ce0326b17a18909ec9eea8b5f75e497301a (diff)
downloadopenembedded-core-edb2a11994ac21e790155ea519bded4b37ef9307.tar.gz
openembedded-core-edb2a11994ac21e790155ea519bded4b37ef9307.tar.bz2
openembedded-core-edb2a11994ac21e790155ea519bded4b37ef9307.zip
distrodata: fix distro_check code
This fixes a problem with package names from inherits showing up Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/distrodata.bbclass')
-rw-r--r--meta/classes/distrodata.bbclass19
1 files changed, 17 insertions, 2 deletions
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index e91200d91e..ce7b931b13 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -8,7 +8,7 @@ python distro_eventhandler() {
logfile = dc.create_log_file(e.data, "distrodata.csv")
lf = bb.utils.lockfile("%s.lock" % logfile)
f = open(logfile, "a")
- f.write("Package,Description,Owner,License,ChkSum,Status,VerMatch,Version,Upsteam,Non-Update,Reason,Recipe Status\n")
+ f.write("Package,Description,Owner,License,ChkSum,Status,VerMatch,Version,Upsteam,Non-Update,Reason,Recipe Status,Distro 1,Distro 2,Distro 3\n")
f.close()
bb.utils.unlockfile(lf)
@@ -34,12 +34,24 @@ python do_distrodata_np() {
bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata)
bb.data.update_data(localdata)
+ if pn.find("-nativesdk") != -1:
+ pnstripped = pn.split("-nativesdk")
+ bb.note("Native Split: %s" % pnstripped)
+ bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata)
+ bb.data.update_data(localdata)
+
if pn.find("-cross") != -1:
pnstripped = pn.split("-cross")
bb.note("cross Split: %s" % pnstripped)
bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata)
bb.data.update_data(localdata)
+ if pn.find("-crosssdk") != -1:
+ pnstripped = pn.split("-crosssdk")
+ bb.note("cross Split: %s" % pnstripped)
+ bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata)
+ bb.data.update_data(localdata)
+
if pn.find("-initial") != -1:
pnstripped = pn.split("-initial")
bb.note("initial Split: %s" % pnstripped)
@@ -181,7 +193,7 @@ python do_distrodata() {
lf = bb.utils.lockfile("%s.lock" % logfile)
f = open(logfile, "a")
- f.write("%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s," % \
+ f.write("%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s" % \
(pname, pdesc, maintainer, plicense, pchksum, hasrstatus, vermatch, pcurver, pupver, noupdate, noupdate_reason, rstatus))
line = ""
for i in result:
@@ -671,6 +683,9 @@ python do_distro_check() {
import oe.distro_check as dc
import bb
import shutil
+ if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk',d):
+ return
+
localdata = bb.data.createCopy(d)
bb.data.update_data(localdata)
tmpdir = bb.data.getVar('TMPDIR', d, True)