Make some change for package report system
cover Make some change for package report system
Make some changes in distrodata.bbclass for package report system
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: lmei3/pkg-report
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/pkg-report
Thanks,
Mei Lei <[email protected]>
---
Mei Lei (1):
distrodata.bbclass: Make some change for package report system
meta/classes/distrodata.bbclass | 38 ++++++++++++++++++++++++++++++++------ 1 files changed, 32 insertions(+), 6 deletions(-)
PATCH 1/1 distrodata.bbclass: Make some change for package report system
Generate some necessary data for package report system and make some change to get more recipes upstream version
Signed-off-by Mei Lei <[email protected]>
--- meta/classes/distrodata.bbclass | 38 ++++++++++++++++++++++++++++++++------ 1 files changed, 32 insertions(+), 6 deletions(-)
meta/classes/distrodata.bbclass +32 -6
@@ -1,4 +1,3 @@ - require conf/distro/include/distro_tracking_fields.inc addhandler distro_eventhandler
@@ -229,6 +228,14 @@ python checkpkg_eventhandler() { f.write("Package\tOwner\tURI Type\tVersion\tTracking\tUpstream\tTMatch\tRMatch\n") f.close() bb.utils.unlockfile(lf) + """initialize log files for package report system""" + logfile2 = os.path.join(logpath, "get_pkg_info.%s.log" % bb.data.getVar('DATETIME', e.data, 1)) + if not os.path.exists(logfile2): + slogfile2 = os.path.join(logpath, "get_pkg_info.log") + if os.path.exists(slogfile2): + os.remove(slogfile2) + os.system("touch %s" % logfile2) + os.symlink(logfile2, slogfile2) return }
@@ -239,7 +246,6 @@ python do_checkpkg() { import sys import re import tempfile - """ sanity check to ensure same name and type. Match as many patterns as possible such as:
@@ -257,8 +263,8 @@ python do_checkpkg() { prefix1 = "[a-zA-Z][a-zA-Z0-9]*([\-_][a-zA-Z]\w+)*[\-_]" # match most patterns which uses "-" as separator to version digits prefix2 = "[a-zA-Z]+" # a loose pattern such as for unzip552.tar.gz prefix = "(%s|%s)" % (prefix1, prefix2) - suffix = "(tar\.gz|tgz|tar\.bz2|zip)" - suffixtuple = ("tar.gz", "tgz", "zip", "tar.bz2") + suffix = "(tar\.gz|tgz|tar\.bz2|zip|tar\.xz)" + suffixtuple = ("tar.gz", "tgz", "zip", "tar.bz2", "tar.xz") sinterstr = "(?P<name>%s?)(?P<ver>.*)" % prefix sdirstr = "(?P<name>%s)(?P<ver>.*)\.(?P<type>%s$)" % (prefix, suffix)
@@ -322,7 +328,7 @@ python do_checkpkg() { which is designed for check purpose but we override check command for our own purpose """ ld = bb.data.createCopy(d) - bb.data.setVar('CHECKCOMMAND_wget', "/usr/bin/env wget -t 1 --passive-ftp -O %s '${URI}'" \ + bb.data.setVar('CHECKCOMMAND_wget', "/usr/bin/env wget -t 1 --passive-ftp -O %s --user-agent=\"Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101027 Ubuntu/9.10 (karmic) Firefox/3.6.12\" '${URI}'" \ % tmpf.name, d) bb.data.update_data(ld)
@@ -420,7 +426,7 @@ python do_checkpkg() { """match "{PN}-5.21.1.tar.gz">{PN}-5.21.1.tar.gz """ pn1 = re.search("^%s" % prefix, curname).group() s = "[^\"]*%s[^\d\"]*?(\d+[\.\-_])+[^\"]*" % pn1 - searchstr = "[hH][rR][eE][fF]=\"%s\">" % s + searchstr = "[hH][rR][eE][fF]=\"%s\".*>" % s reg = re.compile(searchstr) valid = 0
@@ -460,10 +466,22 @@ python do_checkpkg() { bb.utils.mkdirhier(logpath) logfile = os.path.join(logpath, "checkpkg.csv") + """initialize log files for package report system""" + logfile2 = os.path.join(logpath, "get_pkg_info.log") + """generate package information from .bb file""" pname = bb.data.getVar('PN', d, 1) pdesc = bb.data.getVar('DESCRIPTION', d, 1) pgrp = bb.data.getVar('SECTION', d, 1) + pversion = bb.data.getVar('PV', d, 1) + plicense = bb.data.getVar('LICENSE',d,1) + psection = bb.data.getVar('SECTION',d,1) + phome = bb.data.getVar('HOMEPAGE', d, 1) + prelease = bb.data.getVar('PR',d,1) + ppriority = bb.data.getVar('PRIORITY',d,1) + pdepends = bb.data.getVar('DEPENDS',d,1) + pbugtracker = bb.data.getVar('BUGTRACKER',d,1) + ppe = bb.data.getVar('PE',d,1) found = 0 for uri in src_uri.split():
@@ -609,6 +627,14 @@ python do_checkpkg() { (pname, maintainer, pproto, pcurver, pmver, pupver, pmstatus, pstatus)) f.close() bb.utils.unlockfile(lf) + + """write into get_pkg_info log file to supply data for package report system""" + lf2 = bb.utils.lockfile(logfile2 + ".lock") + f2 = open(logfile2, "a") + 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" % \ + (pname,pversion,pupver,plicense,psection, phome,prelease, ppriority,pdepends,pbugtracker,ppe,pdesc,pstatus,pmver)) + f2.close() + bb.utils.unlockfile(lf2) } addtask checkpkgall after do_checkpkg
Signature · 1 line
1.6.3.3