diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-03-17 17:57:46 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-03-17 17:57:46 +0000 |
| commit | 6142c77d5d691a59157f12d71bcb4f5c9e8837fd (patch) | |
| tree | c6ca12b6f28200fdb87d17d0394369ebb5966871 | |
| parent | 09bb585ba70bc7c651d62c9aa9ac0e57595df31c (diff) | |
| parent | a828847f3281b8c4254cf89a551c9dcf3e0e4787 (diff) | |
merge of '13300dbb95259891ffdb187402ac66a12e7f43c7'
and 'c18417178fcb2dac2e3931442dc1d0cf1ba2e5c8'
62 files changed, 5561 insertions, 598 deletions
diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass index 8d5e234c49..4c0d4f9a82 100644 --- a/classes/seppuku.bbclass +++ b/classes/seppuku.bbclass @@ -15,6 +15,8 @@ def seppuku_spliturl(url): param = {} for par in query.split("&"): (key,value) = urllib.splitvalue(par) + if not key or len(key) == 0 or not value: + continue key = urllib.unquote(key) value = urllib.unquote(value) param[key] = value @@ -65,10 +67,13 @@ def seppuku_find_bug_report_old(): HTMLParser.__init__(self) self.state = self.STATE_NONE self.bugs = [] + self.bug = None def handle_starttag(self, tag, attr): if self.state == self.STATE_NONE and tag.lower() == "tr": - if len(attr) == 1 and attr[0] == ('class', 'bz_normal bz_P2 '): + if len(attr) == 1 and attr[0][0] == 'class' and \ + ('bz_normal' in attr[0][1] or 'bz_blocker' in attr[0][1] or 'bz_enhancement' in attr[0][1] or 'bz_major' in attr[0][1] or 'bz_minor' in attr[0][1] or 'bz_trivial' in attr[0][1] or 'bz_critical' in attr[0][1] or 'bz_wishlist' in attr[0][1]) \ + and 'bz_P' in attr[0][1]: self.state = self.STATE_FOUND_TR elif self.state == self.STATE_FOUND_TR and tag.lower() == "td": self.state += 1 @@ -78,6 +83,7 @@ def seppuku_find_bug_report_old(): if self.state != self.STATE_NONE: self.bugs.append( (self.bug,self.status) ) self.state = self.STATE_NONE + self.bug = None if self.state > 1 and tag.lower() == "td": self.state += 1 @@ -89,7 +95,11 @@ def seppuku_find_bug_report_old(): return if self.state == self.STATE_FOUND_NUMBER: - self.bug = data + """ + #1995 in bugs.oe.org has [SEC] additionally to the number and we want to ignore it + """ + if not self.bug: + self.bug = data elif self.state == self.STATE_FOUND_STATUS: self.status = data @@ -281,6 +291,7 @@ python seppuku_eventhandler() { else: print "Logged into the box" + file = None if name == "TaskFailed": bugname = "%(package)s-%(pv)s-%(pr)s-%(task)s" % { "package" : bb.data.getVar("PN", data, True), "pv" : bb.data.getVar("PV", data, True), @@ -288,11 +299,11 @@ python seppuku_eventhandler() { "task" : e.task } log_file = glob.glob("%s/log.%s.*" % (bb.data.getVar('T', event.data, True), event.task)) text = "The package failed to build at %s" % bb.data.getVar('DATETIME', data, True) - file = open(log_file[0], 'r') + if len(log_file) != 0: + file = open(log_file[0], 'r') elif name == "NoProvider": bugname = "noprovider for %s runtime: %s" % (event.getItem, event.getisRuntime) text = "Please fix it" - file = None else: assert False diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index bd2a0e4e5e..b0f47c6dc0 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -30,10 +30,12 @@ IMAGE_FSTYPES = "jffs2" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermediate" + +# not used yet +#PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" +#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" #PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate" #PREFERRED_PROVIDER_virtual/sparc-foonas-linux-libc-for-gcc = "glibc-intermediate" @@ -83,7 +85,6 @@ PREFERRED_VERSION_glibc-intermediate = "2.5" PREFERRED_VERSION_glibc-initial = "2.5" GLIBC_EXTRA_OECONF = "--with-tls" -PREFERRED_VERSION_glib-2.0 = "2.12.10" PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" GLIBC_ADDONS ?= "ports,nptl,libidn" diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index 619b0f4339..554157ca85 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -3,7 +3,6 @@ TARGET_OS = "linux" TARGET_FPU = "soft" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" -# terminal specs - console, but no other ports SERIAL_CONSOLE="115200 console" USE_VT="0" @@ -13,15 +12,15 @@ PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.20" # Do we need any kernel modules? -#N2100_KERNEL = "" +FOONAS_KERNEL = "kernel-module-ext2 kernel-module-usb-storage" + +FOONAS_SUPPORT += "fis" # We want udev support in the image udevdir = "/dev" -N2100_SUPPORT ?= "cpio udev" BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm" -EXTRA_IMAGECMD_jffs2 += " --little-endian" -# Hardware stuff used in image generation +EXTRA_IMAGECMD_jffs2 += " --little-endian" ERASEBLOCK_SIZE = "0x20000" JFFS2_ROOTFS_SIZE = "0xC80000" KERNEL_IMAGE_SIZE = "0x280000" diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index 7f7d24c1e9..41dfd8d09e 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -11,16 +11,16 @@ USE_VT="0" MODUTILS=26 MACHINE_FEATURES= "kernel26 usbhost" PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation" - -# Do we need any kernel modules? -OPENTURBOSTATION_KERNEL = "" +FOONAS_KERNEL = "kernel-module-ext3 kernel-module-minix \ + kernel-module-usb-storage" # We want udev support in the image udevdir = "/dev" -TURBOSTATION_SUPPORT ?= "cpio uboot-utils udev" BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm" +FOONAS_SUPPORT += "uboot-utils" # Hardware stuff used in image generation +EXTRA_IMAGECMD = "--big-endian" ERASEBLOCK_SIZE = "0x20000" JFFS2_ROOTFS_SIZE = "0xC80000" KERNEL_IMAGE_SIZE = "0x280000" diff --git a/contrib/qa/bugzilla.py b/contrib/qa/bugzilla.py index 1bc0ce9949..17849552b0 100644 --- a/contrib/qa/bugzilla.py +++ b/contrib/qa/bugzilla.py @@ -25,11 +25,16 @@ class BugQueryExtractor(HTMLParser): def __init__(self): HTMLParser.__init__(self) self.state = self.STATE_NONE + self.bug = None self.bugs = [] def handle_starttag(self, tag, attr): if self.state == self.STATE_NONE and tag.lower() == "tr": - if len(attr) == 1 and attr[0] == ('class', 'bz_normal bz_P2 '): + # check for bz_normal and bz_P2 as indicator in buglist.cgi + # use 'all' and 'map' on python2.5 + if len(attr) == 1 and attr[0][0] == 'class' and \ + ('bz_normal' in attr[0][1] or 'bz_blocker' in attr[0][1] or 'bz_enhancement' in attr[0][1] or 'bz_major' in attr[0][1] or 'bz_minor' in attr[0][1] or 'bz_trivial' in attr[0][1] or 'bz_critical' in attr[0][1] or 'bz_wishlist' in attr[0][1]) \ + and 'bz_P' in attr[0][1]: print "Found tr %s %s" % (tag, attr) self.state = self.STATE_FOUND_TR elif self.state == self.STATE_FOUND_TR and tag.lower() == "td": @@ -41,6 +46,7 @@ class BugQueryExtractor(HTMLParser): if self.state != self.STATE_NONE: self.bugs.append( (self.bug,self.status) ) self.state = self.STATE_NONE + self.bug = None if self.state > 1 and tag.lower() == "td": print "Next TD" self.state += 1 @@ -51,11 +57,17 @@ class BugQueryExtractor(HTMLParser): # skip garbage if len(data) == 0: return - + if self.state == self.STATE_FOUND_NUMBER: + """ + #1995 in bugs.oe.org has [SEC] additionally to the number and we want to ignore it + """ print "Bug Number '%s'" % data.strip() + if self.bug: + print "Ignoring bug data" + return self.bug = data - + elif self.state == self.STATE_FOUND_STATUS: print "Status Name '%s'" % data.strip() self.status = data @@ -65,267 +77,7 @@ class BugQueryExtractor(HTMLParser): return self.bugs # -site = """<!-- 1.0@bugzilla.org --> - - - - - - - - - - - -<!-- 1.0@bugzilla.org --> - - - - -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Bug List</title> - - - - - - <link href="/style/style.css" rel="stylesheet" type="text/css" /> - - <link href="/bugzilla/css/buglist.css" rel="stylesheet" type="text/css"> - - </head> - - - - <body bgcolor="#FFFFFF" onload=""> - - -<!-- 1.0@bugzilla.org --> - - - - - <div id="header"> - <a href="http://bugzilla.openmoko.org/cgi-bin/bugzilla/" id="site_logo"><img src="/style/images/openmoko_logo.png" alt="openmoko.org" /></a> - - <div id="main_navigation"> - <ul> - <li><a href="http://www.openmoko.org/" class="nav_home"><span>Home</span></a></li> - <li><a href="http://wiki.openmoko.org/" class="nav_wiki"><span>Wiki</span></a></li> - <li><a href="http://bugzilla.openmoko.org/" class="nav_bugzilla selected"><span>Bugzilla</span></a></li> - <li><a href="http://planet.openmoko.org/" class="nav_planet"><span>Planet</span></a></li> - <li><a href="http://projects.openmoko.org/" class="nav_projects"><span>Projects</span></a></li> - <li><a href="http://lists.openmoko.org/" class="nav_lists"><span>Lists</span></a></li> - </ul> - </div> - </div> - - <div class="page_title"> - <strong>Bug List</strong> - </div> - - <div class="container"> - -<div align="center"> - <b>Tue Mar 6 19:01:13 CET 2007</b><br> - - - <a href="quips.cgi"><i>Free your problems -</i></a> - -</div> - - -<hr> - - - - - - - - - - - - - - - - - -<!-- 1.0@bugzilla.org --> - - - - - - - - - - - - - - - - - - - - - - - <table class="bz_buglist" cellspacing="0" cellpadding="4" width="100%"> - <colgroup> - <col class="bz_id_column"> - <col class="bz_severity_column"> - <col class="bz_priority_column"> - <col class="bz_platform_column"> - <col class="bz_owner_column"> - <col class="bz_status_column"> - <col class="bz_resolution_column"> - <col class="bz_summary_column"> - </colgroup> - - <tr align="left"> - <th colspan="1"> - <a href="buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=OpenMoko&component=autobuilds&order=bugs.bug_id">ID</a> - </th> - -<th colspan="1"> - <a href="buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=OpenMoko&component=autobuilds&order=bugs.bug_severity,bugs.bug_id">Sev</a> - </th><th colspan="1"> - <a href="buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=OpenMoko&component=autobuilds&order=bugs.priority,bugs.bug_id">Pri</a> - </th><th colspan="1"> - <a href="buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=OpenMoko&component=autobuilds&order=bugs.rep_platform,bugs.bug_id">Plt</a> - </th><th colspan="1"> - <a href="buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=OpenMoko&component=autobuilds&order=map_assigned_to.login_name,bugs.bug_id">Owner</a> - </th><th colspan="1"> - <a href="buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=OpenMoko&component=autobuilds&order=bugs.bug_status,bugs.bug_id">State</a> - </th><th colspan="1"> - <a href="buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=OpenMoko&component=autobuilds&order=bugs.resolution,bugs.bug_id">Result</a> - </th><th colspan="1"> - <a href="buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=OpenMoko&component=autobuilds&order=bugs.short_desc,bugs.bug_id">Summary</a> - </th> - - - </tr> - - <tr class="bz_normal bz_P2 "> - - <td> - <a href="show_bug.cgi?id=238">238</a> - </td> - - <td><nobr>nor</nobr> - </td> - <td><nobr>P2</nobr> - </td> - <td><nobr>Mac</nobr> - </td> - <td><nobr>mickey@vanille-media.de</nobr> - </td> - <td><nobr>NEW</nobr> - </td> - <td><nobr></nobr> - </td> - <td>manual test bug - </td> - - </tr> - - - </table> - - - - - - One bug found. - - -<br> - - - - - - - - - - - - - <form method="post" action="long_list.cgi"> - <input type="hidden" name="buglist" value="238"> - <input type="submit" value="Long Format"> - - <a href="query.cgi">Query Page</a> - <a href="enter_bug.cgi">Enter New Bug</a> - <a href="colchange.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=OpenMoko&component=autobuilds">Change Columns</a> - - - - <a href="query.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=OpenMoko&component=autobuilds">Edit this Query</a> - - </form> - - - - - - -<!-- 1.0@bugzilla.org --> - - - - - - -</div> - -<div class="footer"> - <div class="group">This is <b>Bugzilla</b>: the Mozilla bug system. For more information about what Bugzilla is and what it can do, see <a href="http://www.bugzilla.org/">bugzilla.org</a>.</div> - <!-- 1.0@bugzilla.org --> - - - - - - -<form method="get" action="show_bug.cgi"> - <div class="group"> - <a href="enter_bug.cgi">New</a> | <a href="query.cgi">Query</a> | <input type="submit" value="Find"> bug # <input name="id" size="6"> | <a href="reports.cgi">Reports</a> | <a href="votes.cgi?action=show_user">My Votes</a> - </div> - - <div class="group"> - Edit <a href="userprefs.cgi">prefs</a> - | <a href="relogin.cgi">Log out</a> freyther@yahoo.com - </div> - - - - - <div class="group"> - Preset Queries: - - <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=freyther%40yahoo.com&emailtype1=exact&emailassigned_to1=1&emailreporter1=1">My Bugs</a> - - </div> -</form> -</div> - -</body> -</html> -""" - -all_bugs = """<!-- 1.0@bugzilla.org --> +bugs_openmoko = """<!-- 1.0@bugzilla.org --> @@ -390,10 +142,10 @@ all_bugs = """<!-- 1.0@bugzilla.org --> <div class="container"> <div align="center"> - <b>Tue Mar 6 20:23:16 CET 2007</b><br> + <b>Fri Mar 16 20:51:52 CET 2007</b><br> - <a href="quips.cgi"><i>Free your problems + <a href="quips.cgi"><i>It was a time of great struggle and heroic deeds </i></a> </div> @@ -405,7 +157,7 @@ all_bugs = """<!-- 1.0@bugzilla.org --> -228 bugs found. +282 bugs found. @@ -454,23 +206,23 @@ all_bugs = """<!-- 1.0@bugzilla.org --> <tr align="left"> <th colspan="1"> - <a href="buglist.cgi?product=OpenMoko&order=bugs.bug_id">ID</a> + <a href="buglist.cgi?short_desc_type=allwordssubstr&short_desc=&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_s |