summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMei Lei <lei.mei@intel.com>2011-03-25 16:18:21 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-06 08:01:13 -0700
commit44dabb20f2bada8fd7d6e06fef80df9568e68b98 (patch)
tree8bd76e6f01a8df8c58fa0acec1c1e0f69d16eb39 /meta/classes
parentc5e6ef2a44db57f2b03ea1ddf663c0f28a9aeae3 (diff)
downloadpoky-44dabb20f2bada8fd7d6e06fef80df9568e68b98.tar.gz
distrodata.bbclass: Merge the get_pkg_info.log into checkpkg.csv
For easy view the check package result, merge the two files into checkpkg.csv, after that, the package report system will use checkpkg.csv instead of get_pkg_info.log. (From OE-Core rev: e75d5808aef42733c83d1ca0151068503fe4d82c) Signed-off-by: Mei Lei <lei.mei@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/distrodata.bbclass29
1 files changed, 7 insertions, 22 deletions
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index e2cc8fa049..905dad7b9c 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -225,17 +225,9 @@ python checkpkg_eventhandler() {
225 225
226 lf = bb.utils.lockfile(logfile + ".lock") 226 lf = bb.utils.lockfile(logfile + ".lock")
227 f = open(logfile, "a") 227 f = open(logfile, "a")
228 f.write("Package\tOwner\tURI Type\tVersion\tTracking\tUpstream\tTMatch\tRMatch\n") 228 f.write("Package\tVersion\tUpver\tLicense\tSection\tHome\tRelease\tPriority\tDepends\tBugTracker\tPE\tDescription\tStatus\tTracking\tURI\tMAINTAINER\n")
229 f.close() 229 f.close()
230 bb.utils.unlockfile(lf) 230 bb.utils.unlockfile(lf)
231 """initialize log files for package report system"""
232 logfile2 = os.path.join(logpath, "get_pkg_info.%s.log" % bb.data.getVar('DATETIME', e.data, 1))
233 if not os.path.exists(logfile2):
234 slogfile2 = os.path.join(logpath, "get_pkg_info.log")
235 if os.path.exists(slogfile2):
236 os.remove(slogfile2)
237 os.system("touch %s" % logfile2)
238 os.symlink(logfile2, slogfile2)
239 return 231 return
240} 232}
241 233
@@ -459,8 +451,6 @@ python do_checkpkg() {
459 logpath = bb.data.getVar('LOG_DIR', d, 1) 451 logpath = bb.data.getVar('LOG_DIR', d, 1)
460 bb.utils.mkdirhier(logpath) 452 bb.utils.mkdirhier(logpath)
461 logfile = os.path.join(logpath, "checkpkg.csv") 453 logfile = os.path.join(logpath, "checkpkg.csv")
462 """initialize log files for package report system"""
463 logfile2 = os.path.join(logpath, "get_pkg_info.log")
464 454
465 """generate package information from .bb file""" 455 """generate package information from .bb file"""
466 pname = bb.data.getVar('PN', d, 1) 456 pname = bb.data.getVar('PN', d, 1)
@@ -582,7 +572,7 @@ python do_checkpkg() {
582 result = bb.utils.vercmp(("0", puptag, ""), ("0", plocaltag, "")) 572 result = bb.utils.vercmp(("0", puptag, ""), ("0", plocaltag, ""))
583 if result > 0: 573 if result > 0:
584 verflag = 1 574 verflag = 1
585 pstatus = "UPADTE" 575 pstatus = "UPDATE"
586 pupver = puptag 576 pupver = puptag
587 elif verflag == 0 : 577 elif verflag == 0 :
588 pupver = plocaltag 578 pupver = plocaltag
@@ -646,20 +636,15 @@ python do_checkpkg() {
646 pmstatus = "UPDATE" 636 pmstatus = "UPDATE"
647 637
648 maintainer = bb.data.getVar('RECIPE_MAINTAINER', d, True) 638 maintainer = bb.data.getVar('RECIPE_MAINTAINER', d, True)
639 psrcuri = psrcuri.split()[0]
640 pdepends = "".join(pdepends.split("\t"))
641 pdesc = "".join(pdesc.split("\t"))
649 lf = bb.utils.lockfile(logfile + ".lock") 642 lf = bb.utils.lockfile(logfile + ".lock")
650 f = open(logfile, "a") 643 f = open(logfile, "a")
651 f.write("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n" % \ 644 f.write("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n" % \
652 (pname, maintainer, pproto, pcurver, pmver, pupver, pmstatus, pstatus)) 645 (pname,pversion,pupver,plicense,psection, phome,prelease, ppriority,pdepends,pbugtracker,ppe,pdesc,pstatus,pmver,psrcuri,maintainer))
653 f.close() 646 f.close()
654 bb.utils.unlockfile(lf) 647 bb.utils.unlockfile(lf)
655
656 """write into get_pkg_info log file to supply data for package report system"""
657 lf2 = bb.utils.lockfile(logfile2 + ".lock")
658 f2 = open(logfile2, "a")
659 f2.write("%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n" % \
660 (pname,pversion,pupver,plicense,psection, phome,prelease, ppriority,pdepends,pbugtracker,ppe,pdesc,pstatus,pmver,psrcuri))
661 f2.close()
662 bb.utils.unlockfile(lf2)
663} 648}
664 649
665addtask checkpkgall after do_checkpkg 650addtask checkpkgall after do_checkpkg