diff options
21 files changed, 181 insertions, 60 deletions
diff --git a/classes/native.bbclass b/classes/native.bbclass index 556c0e17e2..43000f96bf 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -39,6 +39,9 @@ LDFLAGS_build-darwin = "-L${STAGING_DIR}/${BUILD_SYS}/lib " STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}" STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}" +# Don't use site files for native builds +export CONFIG_SITE = "" + # set the compiler as well. It could have been set to something else export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}" diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass index 4c0d4f9a82..937c973ad5 100644 --- a/classes/seppuku.bbclass +++ b/classes/seppuku.bbclass @@ -32,7 +32,7 @@ def seppuku_login(opener, login, user, password): the resulting page then @param opened = cookie enabled urllib2 opener - @param login = http://bugzilla.openmoko.org/cgi-bin/bugzilla/query.cgi? + @param login = http://bugs.openembedded.org/query.cgi? @param user = Your username @param password = Your password """ @@ -110,20 +110,25 @@ def seppuku_find_bug_report_old(): -def seppuku_find_bug_report(opener, query, product, component, bugname): +def seppuku_find_bug_report(debug_file, opener, query, product, component, bugname): """ Find a bug report with the sane name and return the bug id and the status. @param opener = urllib2 opener - @param query = e.g. https://bugzilla.openmoko.org/cgi-bin/bugzilla/query.cgi? + @param query = e.g. http://bugs.openembedded.org/query.cgi? @param product = search for this product @param component = search for this component @param bugname = the bug to search for - https://bugzilla.openmoko.org/cgi-bin/bugzilla/buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=OpenMoko&emailreporter2=1&emailtype2=substring&email2=freyther%40yahoo.com + http://bugs.openembedded.org/buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=Openembedded&emailreporter2=1&emailtype2=substring&email2=freyther%40yahoo.com but it does not support ctype=csv... """ + import urllib + product = urllib.quote(product) + component = urllib.quote(component) + bugname = urllib.quote(bugname) + result = opener.open("%(query)s?product=%(product)s&component=%(component)s&short_desc_type=substring&short_desc=%(bugname)s" % vars()) if result.code != 200: raise "Can not query the bugzilla at all" @@ -131,8 +136,13 @@ def seppuku_find_bug_report(opener, query, product, component, bugname): scanner = seppuku_find_bug_report_old() scanner.feed(txt) if len(scanner.result()) == 0: + print >> debug_file, "Scanner failed to scan the html site" + print >> debug_file, "%(query)s?product=%(product)s&component=%(component)s&short_desc_type=substring&short_desc=%(bugname)s" % vars() + print >> debug_file, txt return (False,None) else: # silently pick the first result + print >> debug_file, "Result of bug search is " + print >> debug_file, txt (number,status) = scanner.result()[0] return (not status in ["CLOS", "RESO", "VERI"],number) @@ -142,7 +152,7 @@ def seppuku_reopen_bug(poster, file, product, component, bug_number, bugname, te Same as with opening a new report, some bits need to be inside the url - http://bugzilla.openmoko.org/cgi-bin/bugzilla/process_bug.cgi?id=239&bug_file_loc=http%3A%2F%2F&version=2007&longdesclength=2&product=OpenMoko&component=autobuilds&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Neo1973&knob=reopen&target_milestone=Phase+0&short_desc=foo + http://bugs.openembedded.org/process_bug.cgi?id=239&bug_file_loc=http%3A%2F%2F&version=Angstrom&longdesclength=2&product=Openembedded&component=Build&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&knob=reopen&short_desc=foo """ import urllib2 @@ -177,7 +187,7 @@ def seppuku_file_bug(poster, file, product, component, bugname, text): Create a completely new bug report - http://bugzilla.openmoko.org/cgi-bin/bugzilla/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=2007&product=OpenMoko&component=autobuilds&short_desc=foo&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Neo1973 + http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&product=Openembedded&component=Build&short_desc=foo&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other You are forced to add some default values to the bugzilla query and stop with '&' @@ -206,12 +216,17 @@ def seppuku_file_bug(poster, file, product, component, bugname, text): print e return False - if result.code != 200: - return False + # scan the result for a bug number + # it will look like + # '<a href="show_bug.cgi?id=308">Back To BUG# 308</a>' + import re + res = re.findall(("\>Back To BUG\# (?P<int>\d+)\</a\>"), result.read() ) + if result.code != 200 or len(res) != 1: + return None else: - return True + return res[0] -def seppuku_create_attachment(poster, attach_query, product, component, bug_number, text, file): +def seppuku_create_attachment(debug, poster, attach_query, product, component, bug_number, text, file): """ Create a new attachment for the failed report @@ -235,7 +250,7 @@ def seppuku_create_attachment(poster, attach_query, product, component, bug_numb print e return False - print result.read() + print >> debug, result.read() if result.code != 200: return False else: @@ -284,12 +299,15 @@ python seppuku_eventhandler() { passw = bb.data.getVar("SEPPUKU_PASS", data, True) product = bb.data.getVar("SEPPUKU_PRODUCT", data, True) component = bb.data.getVar("SEPPUKU_COMPONENT", data, True) + # evil hack to figure out what is going on + debug_file = open(os.path.join(bb.data.getVar("TMPDIR", data, True),"..","seppuku-log"),"a") if not seppuku_login(opener, login, user, passw): bb.note("Login to bugzilla failed") + print >> debug_file, "Login to bugzilla failed" return NotHandled else: - print "Logged into the box" + print >> debug_file, "Logged into the box" file = None if name == "TaskFailed": @@ -300,34 +318,44 @@ python seppuku_eventhandler() { 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) if len(log_file) != 0: - file = open(log_file[0], 'r') + 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 runtime: %s" % (event.getItem, event.getisRuntime) text = "Please fix it" else: + print >> debug_file, "Unknown name '%s'" % name assert False - (bug_open, bug_number) = seppuku_find_bug_report(opener, query, product, component, bugname) - - bb.note("Bug is open: %s and bug number: %s" % (bug_open, bug_number)) + (bug_open, bug_number) = seppuku_find_bug_report(debug_file, opener, query, product, component, bugname) + print >> debug_file, "Bug is open: %s and bug number: %s" % (bug_open, bug_number) # The bug is present and still open, no need to attach an error log if bug_number and bug_open: - bb.note("The bug is known as '%s'" % bug_number) + print >> debug_file, "The bug is known as '%s'" % bug_number return NotHandled if bug_number and not bug_open: if not seppuku_reopen_bug(poster, reopen, product, component, bug_number, bugname, text): - bb.note("Failed to reopen the bug report") - elif not seppuku_file_bug(poster, newbug, product, component, bugname, text): - bb.note("Filing a bugreport failed") + print >> debug_file, "Failed to reopen the bug report" + else: + print >> debug_file, "Reopened the bug report" + else: + bug_number = seppuku_file_bug(poster, newbug, product, component, bugname, text) + if not bug_number: + print >> debug_file, "Filing a bugreport failed" else: - # get the new bug number and create an attachment - (bug_open, bug_number) = seppuku_find_bug_report(opener, query, product, component, bugname) + print >> debug_file, "The new bug_number: '%s'" % bug_number if file: - if not seppuku_create_attachment(poster, attach, product, component, bug_number, text, file): - bb.note("Failed to attach the build log") + 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: + print >> debug_file, "Created an attachment for '%s' '%s' '%s'" % (product, component, bug_number) + else: + print >> debug_file, "Not trying to create an attachment" return NotHandled } diff --git a/conf/checksums.ini b/conf/checksums.ini index b4e526b61b..ce7c9adf7b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9690,9 +9690,9 @@ sha256=ab7c305be32708c4ede670e13783b718e6a28e35b5495e6c42c31c35a8b512a6 md5=18c05d88e22c3b815a43ca8d7152ccdc sha256=8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063 -[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.1.tar.gz] -md5=bc6f32759db02cf32a83640d74fb9993 -sha256=cfa9b2d0f9b87a7a524abe149e7207adf86c077749c907342df63126a7ec292d +[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.2.tar.gz] +md5=54935c6cff42df2f1daada267b701392 +sha256=18f0e2df191219c29b47dc12b4b06b5be7eaeef34b3436156547e5a9f4eb51c1 [http://www2.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz] md5=85b6a42a9e17a23c01b2f2ed0ece0563 diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 4c7dd422c3..8679300bc3 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -111,7 +111,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.1" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" diff --git a/conf/documentation.conf b/conf/documentation.conf index 4782a053ba..b92c14f7f0 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -115,19 +115,19 @@ BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure." SEPPUKU_AUTOBUILD[doc] = "This is an autobuild, broken packages are cleaned automatically. Don't define this at all if this is not an autobuild" SEPPUKU_USER[doc] = "The login-name for the bugzilla account" SEPPUKU_PASS[doc] = "The password for this account" -#SEPPUKU_LOGIN = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/query.cgi?" +#SEPPUKU_LOGIN = "http://bugs.openembedded.org/query.cgi?" SEPPUKU_LOGIN[doc] = "path to the login script of the bugzilla, note the ? at the end" -#SEPPUKU_QUERY = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/buglist.cgi" +#SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi" SEPPUKU_QUERY[doc] = "The query script of the bugzilla" -#SEPPUKU_NEWREPORT = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Neo1973&" +#SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" SEPPUKU_NEWREPORT[doc]= "This is the url used to create a new bug report, note the defaults for version and priority and more, and the trailing &" -#SEPPUKU_ADDCOMMENT = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&longdesclength=2&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Neo1973&target_milestone=Phase+0&" +#SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&longdesclength=2&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" SEPPUKU_ADDCOMMENT[doc]= "The url used to reopen bug reports and to add another new comment" -#SEPPUKU_ATTACHMENT = "http:/bugzilla.openmoko.org/cgi-bin/bugzilla/attachment.cgi" +#SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi" SEPPUKU_ATTACHMENT[doc] = "The url used to create attachments." -#SEPPUKU_PRODUCT = "OpenMoko" +#SEPPUKU_PRODUCT = "Openembedded" SEPPUKU_PRODUCT[doc] = "The product inside the bugtracker" -#SEPPUKU_COMPONENT = "autobuilds" +#SEPPUKU_COMPONENT = "build" SEPPUKU_COMPONENT[doc]= "The component inside the bugtracker" diff --git a/packages/aiostress/aiostress_0.0.bb b/packages/aiostress/aiostress_0.0.bb index 8b4085ad4f..9ebc20d371 100644 --- a/packages/aiostress/aiostress_0.0.bb +++ b/packages/aiostress/aiostress_0.0.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Asynchronous I/O stress util" LICENSE = "GPLv2" DEPENDS = "libaio" +PR="r1" -SRC_URI = "ftp://ftp.suse.com/pub/people/mason/utils/aio-stress.c;md5sum=727e5fc3566837b3ea72f887d048769b" +SRC_URI = "http://mirrors.easynews.com/linux/suse/people/mason/utils/aio-stress.c" S = "${WORKDIR}" diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index f87d4df0d1..2171cbd6d5 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -7,8 +7,10 @@ LICENSE = "GPL" PR="r4" DEPENDS = "expat libdaemon dbus glib-2.0" -RRECOMMENDS = "libnss-mdns" -RRECOMMENDS_avahi-daemon = "libnss-mdns" + +# uclibc has no nss +RRECOMMENDS_append_linux = "libnss-mdns" +RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns" RDEPENDS_avahi-daemon = "sysvinit-pidof" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ diff --git a/packages/libmrss/files/atom-right-date.patch b/packages/libmrss/files/atom-right-date.patch deleted file mode 100644 index ba231b2ab4..0000000000 --- a/packages/libmrss/files/atom-right-date.patch +++ /dev/null @@ -1,15 +0,0 @@ -tm_mon goes from 0-11 written dates from 1-12. It is too late to consider security -here. The worst that can happen is that tm_mon == 0 gets negative but I assume -glibc to do range checking. -Index: libmrss-0.17.1/src/mrss_parser.c -=================================================================== ---- libmrss-0.17.1.orig/src/mrss_parser.c 2007-04-08 02:42:23.000000000 +0200 -+++ libmrss-0.17.1/src/mrss_parser.c 2007-04-08 02:43:37.000000000 +0200 -@@ -150,6 +150,7 @@ - { - char datebuf[256]; - stm.tm_year -= 1900; -+ stm.tm_mon -= 1; - - if (!data->c_locale - && !(data->c_locale = newlocale (LC_ALL_MASK, "C", NULL))) diff --git a/packages/libmrss/files/better-parse-url-r0.patch b/packages/libmrss/files/better-parse-url-r0.patch new file mode 100644 index 0000000000..94a78110a2 --- /dev/null +++ b/packages/libmrss/files/better-parse-url-r0.patch @@ -0,0 +1,90 @@ +Index: libmrss-0.17.2/src/mrss.h +=================================================================== +--- libmrss-0.17.2.orig/src/mrss.h 2007-04-02 14:42:55.000000000 +0200 ++++ libmrss-0.17.2/src/mrss.h 2007-05-19 20:56:08.000000000 +0200 +@@ -523,6 +523,22 @@ + mrss_t ** mrss, + mrss_options_t * options); + ++/** ++ * Like the previous function but you take ownership of the downloaded buffer in case of success ++ * \param url The url to be parsed ++ * \param mrss the pointer to your data struct ++ * \param options a pointer to a options data struct ++ * \param feed_content a pointer to the buffer with the document. This is not NULL terminated ++ * \param feed_size the size of the buffer above ++ * \return the error code ++ */ ++mrss_error_t mrss_parse_url_and_transfer_buffer ++ (char * url, ++ mrss_t ** mrss, ++ mrss_options_t * options, ++ char ** feed_content, ++ int * feed_size); ++ + /** + * Parses a file and creates the data struct of the feed RSS url + * \param file The file to be parsed +Index: libmrss-0.17.2/src/mrss_parser.c +=================================================================== +--- libmrss-0.17.2.orig/src/mrss_parser.c 2007-05-19 20:47:08.000000000 +0200 ++++ libmrss-0.17.2/src/mrss_parser.c 2007-05-19 20:56:37.000000000 +0200 +@@ -1075,13 +1075,20 @@ + mrss_error_t + mrss_parse_url (char *url, mrss_t ** ret) + { +- return mrss_parse_url_with_options (url, ret, NULL); ++ return mrss_parse_url_and_transfer_buffer (url, ret, NULL, NULL, NULL); + } + + mrss_error_t + mrss_parse_url_with_options (char *url, mrss_t ** ret, + mrss_options_t * options) + { ++ return mrss_parse_url_and_transfer_buffer (url, ret, options, NULL, NULL); ++} ++ ++mrss_error_t ++mrss_parse_url_and_transfer_buffer (char *url, mrss_t ** ret, ++ mrss_options_t * options, char **download_buffer, int *download_size) ++{ + nxml_t *doc; + mrss_error_t err; + char *buffer; +@@ -1117,7 +1124,8 @@ + + if (nxml_parse_buffer (doc, buffer, size) != NXML_OK) + { +- free (buffer); ++ if (!download_buffer) ++ free (buffer); + nxml_free (doc); + + return MRSS_ERR_PARSER; +@@ -1127,7 +1135,8 @@ + { + if (!((*ret)->file = strdup (url))) + { +- free (buffer); ++ if (!download_buffer) ++ free (buffer); + + mrss_free (*ret); + nxml_free (doc); +@@ -1138,9 +1147,15 @@ + (*ret)->size = size; + } + +- free (buffer); ++ if (!download_buffer) ++ free (buffer); + nxml_free (doc); + ++ /* transfer ownership */ ++ if (download_buffer) ++ *download_buffer = buffer; ++ if (download_size) ++ *download_size = size; + return err; + } + diff --git a/packages/libmrss/libmrss_0.17.1.bb b/packages/libmrss/libmrss_0.17.2.bb index 6476ee58c6..f536468479 100644 --- a/packages/libmrss/libmrss_0.17.1.bb +++ b/packages/libmrss/libmrss_0.17.2.bb @@ -8,7 +8,7 @@ PR = "r1" inherit autotools pkgconfig SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz \ - file://atom-right-date.patch;patch=1 " + file://better-parse-url-r0.patch;patch=1 " do_stage() { autotools_stage_all diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig index 1bf8a6317a..15b4ba5829 100644 --- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig @@ -1164,7 +1164,6 @@ CONFIG_I2C_IXP4XX=y # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_PASEMI is not set # CONFIG_I2C_PROSAVAGE is not set # CONFIG_I2C_SAVAGE4 is not set # CONFIG_I2C_SIS5595 is not set diff --git a/packages/linux/ixp4xx-kernel_2.6.21.bb b/packages/linux/ixp4xx-kernel_2.6.21.1.bb index 59951942c2..8025465058 100644 --- a/packages/linux/ixp4xx-kernel_2.6.21.bb +++ b/packages/linux/ixp4xx-kernel_2.6.21.1.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "839" +IXP4XX_KERNEL_SVN_REV = "847" # # The directory containing the patches to be applied is # specified below diff --git a/packages/clucene/.mtn2git_empty b/packages/nonworking/clucene/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/clucene/.mtn2git_empty +++ b/packages/nonworking/clucene/.mtn2git_empty diff --git a/packages/clucene/clucene-0.8.12-pre/.mtn2git_empty b/packages/nonworking/clucene/clucene-0.8.12-pre/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/clucene/clucene-0.8.12-pre/.mtn2git_empty +++ b/packages/nonworking/clucene/clucene-0.8.12-pre/.mtn2git_empty diff --git a/packages/clucene/clucene-0.8.12-pre/compile-fix.patch b/packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch index 5f6c8f1911..5f6c8f1911 100644 --- a/packages/clucene/clucene-0.8.12-pre/compile-fix.patch +++ b/packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch diff --git a/packages/clucene/clucene_0.8.12-pre.bb b/packages/nonworking/clucene/clucene_0.8.12-pre.bb index 2c8122c921..2c8122c921 100644 --- a/packages/clucene/clucene_0.8.12-pre.bb +++ b/packages/nonworking/clucene/clucene_0.8.12-pre.bb diff --git a/packages/pimlico/tasks.inc b/packages/pimlico/tasks.inc index 9b7c245ad3..797969db62 100644 --- a/packages/pimlico/tasks.inc +++ b/packages/pimlico/tasks.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Task list application" LICENSE = "GPL" SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ eds-dbus" +DEPENDS = "glib-2.0 libsexy gtk+ eds-dbus" inherit autotools pkgconfig gtk-icon-cache diff --git a/packages/pimlico/tasks_0.5.bb b/packages/pimlico/tasks_0.5.bb new file mode 100644 index 0000000000..d3e1b695e9 --- /dev/null +++ b/packages/pimlico/tasks_0.5.bb @@ -0,0 +1,5 @@ +require tasks.inc + +PR = "r0" + +SRC_URI = "http://pimlico-project.org/sources/${PN}/${P}.tar.gz" diff --git a/packages/python/python-pycairo_1.2.2.bb b/packages/python/python-pycairo_1.2.2.bb index 46638d2794..22ba095aa2 100644 --- a/packages/python/python-pycairo_1.2.2.bb +++ b/packages/python/python-pycairo_1.2.2.bb @@ -3,7 +3,7 @@ SECTION = "python-devel" HOMEPAGE = "http://cairographics.org/pycairo" LICENSE = "LGPL MPL" DEPENDS = "cairo" -PR = "ml1" +PR = "ml2" SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \ file://fix-pkgconfig-dir.patch;patch=1" @@ -16,3 +16,5 @@ do_stage() { install -m 0644 cairo/pycairo.h ${STAGING_INCDIR} } + +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/cairo/.debug" diff --git a/packages/python/python-pygobject_2.12.3.bb b/packages/python/python-pygobject_2.12.3.bb index 04ba363857..d09349575b 100644 --- a/packages/python/python-pygobject_2.12.3.bb +++ b/packages/python/python-pygobject_2.12.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Python GObject bindings" SECTION = "devel/python" LICENSE = "LGPL" DEPENDS = "python-pygobject-native" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 \ file://python-path.patch;patch=1" @@ -20,3 +20,6 @@ do_stage() { install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ } + +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/gobject/.debug" + diff --git a/packages/python/python-pygtk2_2.10.3.bb b/packages/python/python-pygtk2_2.10.3.bb index f7366af401..a71765dfbc 100644 --- a/packages/python/python-pygtk2_2.10.3.bb +++ b/packages/python/python-pygtk2_2.10.3.bb @@ -5,7 +5,7 @@ DEPENDS = "gtk+ libglade python-pycairo python-pygobject" RDEPENDS = "python-shell" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml2" +PR = "ml3" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \ file://fix-gtkunixprint.patch;patch=1 \ @@ -21,6 +21,9 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ } +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/*/.debug" +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug" + do_stage() { autotools_stage_includes sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0 |