diff options
| -rw-r--r-- | classes/seppuku.bbclass | 18 | ||||
| -rw-r--r-- | conf/distro/include/preferred-xorg-versions.inc | 2 | ||||
| -rw-r--r-- | packages/gtk+/gtk+_2.10.14.bb | 2 | ||||
| -rw-r--r-- | packages/gtk+/gtk-2.10.inc | 10 | ||||
| -rw-r--r-- | packages/linux/linux-jlime-current.bb | 2 |
5 files changed, 18 insertions, 16 deletions
diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass index 9e9772cb67..7ae1458b89 100644 --- a/classes/seppuku.bbclass +++ b/classes/seppuku.bbclass @@ -218,9 +218,9 @@ def seppuku_file_bug(poster, file, product, component, bugname, text): # scan the result for a bug number # it will look like - # '<a href="show_bug.cgi?id=308">Back To BUG# 308</a>' + # '<title>Bug 2742 Submitted</title>' import re - res = re.findall(("\>Back To BUG\# (?P<int>\d+)\</a\>"), result.read() ) + res = re.findall(("\>Bug (?P<int>\d+) Submitted"), result.read() ) if result.code != 200 or len(res) != 1: return None else: @@ -234,7 +234,7 @@ def seppuku_create_attachment(debug, poster, attach_query, product, component, b if not bug_number: import bb - bb.note("Can't create an attachment, the bug is not present") + bb.note("Can't create an attachment, no bugnumber passed to method") return False import urllib2 @@ -320,15 +320,15 @@ python seppuku_eventhandler() { "pr" : bb.data.getVar("PR", data, True), "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) + text = "The package failed to build at %s for machine %s" % (bb.data.getVar('DATETIME', data, True), bb.data.getVar( 'MACHINE', data, True ) ) if len(log_file) != 0: print >> debug_file, "Adding log file %s" % log_file[0] file = open(log_file[0], 'r') else: print >> debug_file, "No log file found for the glob" - elif name == "NoProvider": - bugname = "noprovider for %s " % (event.getItem) - text = "Please fix it" + #elif name == "NoProvider": + # bugname = "noprovider for %s " % (event.getItem) + # text = "Please fix it" else: print >> debug_file, "Unknown name '%s'" % name assert False @@ -349,11 +349,11 @@ python seppuku_eventhandler() { else: bug_number = seppuku_file_bug(poster, newbug, product, component, bugname, text) if not bug_number: - print >> debug_file, "Filing a bugreport failed" + print >> debug_file, "Couldn't acquire a new bug_numer, filing a bugreport failed" else: print >> debug_file, "The new bug_number: '%s'" % bug_number - if file: + if bug_number and file: if not seppuku_create_attachment(debug_file, poster, attach, product, component, bug_number, text, file): print >> debug_file, "Failed to attach the build log" else: diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc index 0681b01d3d..fa66d61a0a 100644 --- a/conf/distro/include/preferred-xorg-versions.inc +++ b/conf/distro/include/preferred-xorg-versions.inc @@ -103,7 +103,7 @@ PREFERRED_VERSION_xproxymanagementprotocol = "1.0.2" PREFERRED_VERSION_xrandr = "1.2.2" PREFERRED_VERSION_xrdb = "1.0.3" PREFERRED_VERSION_xserver-kdrive = "1.3.0.0" -PREFERRED_VERSION_xserver-xorg = "1.1.0" +PREFERRED_VERSION_xserver-xorg = "1.3.0.0" PREFERRED_VERSION_xset = "1.0.2" PREFERRED_VERSION_xtrans = "1.0.3" PREFERRED_VERSION_xtrans-native = "1.0.3" diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb index db546d2cb6..751f4a4113 100644 --- a/packages/gtk+/gtk+_2.10.14.bb +++ b/packages/gtk+/gtk+_2.10.14.bb @@ -1,6 +1,6 @@ require gtk-2.10.inc -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc index cc97e960a4..4ed214cfd3 100644 --- a/packages/gtk+/gtk-2.10.inc +++ b/packages/gtk+/gtk-2.10.inc @@ -27,11 +27,11 @@ FILES_${PN}-dbg += " \ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*" -RRECOMMENDS_${PN} = " ttf-dejavu-sans" -RRECOMMENDS_${PN}_append_angstrom = " gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_append_openzaurus = " gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_append_linux = " glibc-gconv-iso8859-1" -RRECOMMENDS_${PN}_append_linux-gnueabi = " glibc-gconv-iso8859-1" +NEATSTUFF = " ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm " + +RRECOMMENDS_${PN} = " ${NEATSTUFF} " +RRECOMMENDS_${PN}_linux = " ${NEATSTUFF} glibc-gconv-iso8859-1 " +RRECOMMENDS_${PN}_linux-gnueabi = " ${NEATSTUFF} glibc-gconv-iso8859-1" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" diff --git a/packages/linux/linux-jlime-current.bb b/packages/linux/linux-jlime-current.bb index 68bcd4ab04..21cf1a224b 100644 --- a/packages/linux/linux-jlime-current.bb +++ b/packages/linux/linux-jlime-current.bb @@ -9,6 +9,8 @@ DESCRIPTION = "2.6 Linux Development Kernel for JLime supported Machines." SECTION = "kernel" LICENSE = "GPL" +COMPATIBLE_MACHINE = "fillmein" + inherit kernel PR = "r1" |