diff options
54 files changed, 7192 insertions, 237 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index e8657387a3..637bedd588 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -263,7 +263,7 @@ python base_do_unpack() { addhandler base_eventhandler python base_eventhandler() { from bb import note, error, data - from bb.event import Handled, NotHandled, getName + from bb.event import getName name = getName(e) @@ -272,7 +272,7 @@ python base_eventhandler() { elif name == "UnsatisfiedDep": msg = "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower()) else: - return NotHandled + return # Only need to output when using 1.8 or lower, the UI code handles it # otherwise @@ -309,15 +309,13 @@ python base_eventhandler() { os.system('touch ' + e.stampPrefix[fn] + '.needclean') if not data in e.__dict__: - return NotHandled + return log = data.getVar("EVENTLOG", e.data, 1) if log: logfile = file(log, "a") logfile.write("%s\n" % msg) logfile.close() - - return NotHandled } addtask configure after do_unpack do_patch diff --git a/classes/failure-cleanup.bbclass b/classes/failure-cleanup.bbclass index 3870c756c8..0425602ce8 100644 --- a/classes/failure-cleanup.bbclass +++ b/classes/failure-cleanup.bbclass @@ -4,15 +4,13 @@ addhandler failure_eventhandler python failure_eventhandler() { from bb import build, event, note, error, data - from bb.event import NotHandled, getName + from bb.event import getName if e.data is None or getName(e) == "MsgNote": - return NotHandled + return name = getName(e) if name == "PkgFailed": bb.note("Exectuting -c clean on failed build") build.exec_func('do_clean', e.data) - - return NotHandled } diff --git a/classes/insane.bbclass b/classes/insane.bbclass index c85703eee2..7e42f459d7 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -61,6 +61,7 @@ def package_qa_get_machine_dict(): "i486": ( 3, 0, 0, True, True), "i586": ( 3, 0, 0, True, True), "i686": ( 3, 0, 0, True, True), + "x86_64": ( 62, 0, 0, True, False), "mips": ( 8, 0, 0, False, True), "mipsel": ( 8, 0, 0, True, True), "avr32": (6317, 0, 0, False, True), diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass index e4e6206ac4..4415461364 100644 --- a/classes/oestats-client.bbclass +++ b/classes/oestats-client.bbclass @@ -178,14 +178,14 @@ python oestats_eventhandler () { import time if e.data is None or getName(e) == "MsgNote": - return NotHandled + return server = bb.data.getVar('OESTATS_SERVER', e.data, True) if not server.startswith('http://') and not server.startswith('https://'): server = "http://%s" %(server) builder = bb.data.getVar('OESTATS_BUILDER', e.data, True) if not server or not builder: - return NotHandled + return if getName(e) == 'BuildStarted': oestats_start(server, builder, e.data) @@ -197,6 +197,4 @@ python oestats_eventhandler () { oestats_task(server, e.data, e.task, 'Succeeded') elif getName(e) == 'TaskFailed': oestats_task(server, e.data, e.task, 'Failed') - - return NotHandled } diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index f755d2340d..9c72d11b8c 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -262,8 +262,6 @@ python packagedstage_stampfixing_eventhandler() { dir = "%s.do_%s" % (e.stampPrefix[fn], task) os.system('rm -f ' + dir) os.system('rm -f ' + stamp) - - return NotHandled } populate_staging_preamble () { diff --git a/classes/recipe_sanity.bbclass b/classes/recipe_sanity.bbclass index 9becf49384..127806e6da 100644 --- a/classes/recipe_sanity.bbclass +++ b/classes/recipe_sanity.bbclass @@ -150,7 +150,7 @@ python recipe_sanity_eh () { from bb.event import getName if getName(e) != "ConfigParsed": - return NotHandled + return d = e.data diff --git a/classes/rm_work.bbclass b/classes/rm_work.bbclass index 0857f49852..e6f3aa012e 100644 --- a/classes/rm_work.bbclass +++ b/classes/rm_work.bbclass @@ -44,7 +44,5 @@ python rmwork_stampfixing_eventhandler() { dir = "%s.*" % e.stampPrefix[fn] bb.note("Removing stamps: " + dir) os.system('rm -f '+ dir) - - return NotHandled } diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index e8b6587500..4051d49557 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -180,9 +180,6 @@ def check_sanity(e): addhandler check_sanity_eventhandler python check_sanity_eventhandler() { - from bb.event import Handled, NotHandled if bb.event.getName(e) == "ConfigParsed": check_sanity(e) - - return NotHandled } diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass index 546738dde8..81e7ff6d37 100644 --- a/classes/seppuku.bbclass +++ b/classes/seppuku.bbclass @@ -279,7 +279,7 @@ python seppuku_eventhandler() { Report task failures to the bugzilla and succeeded builds to the box """ - from bb.event import NotHandled, getName + from bb.event import getName from bb import data, mkdirhier, build import bb, os, glob @@ -288,20 +288,20 @@ python seppuku_eventhandler() { name = getName(event) if name == "MsgNote": # avoid recursion - return NotHandled + return # Try to load our exotic libraries try: import MultipartPostHandler except: bb.note("You need to put the MultipartPostHandler into your PYTHONPATH. Download it from http://pipe.scs.fsu.edu/PostHandler/MultipartPostHandler.py") - return NotHandled + return try: import urllib2, cookielib except: bb.note("Failed to import the cookielib and urllib2, make sure to use python2.4") - return NotHandled + return if name == "PkgFailed": if not bb.data.getVar('SEPPUKU_AUTOBUILD', data, True) == "0": @@ -331,7 +331,7 @@ python seppuku_eventhandler() { if not seppuku_login(opener, login, user, passw): bb.note("Login to bugzilla failed") print >> debug_file, "Login to bugzilla failed" - return NotHandled + return else: print >> debug_file, "Logged into the box" @@ -364,7 +364,7 @@ python seppuku_eventhandler() { print >> debug_file, "Created an attachment for '%s' '%s' '%s'" % (product, component, bug_number) else: print >> debug_file, "Not trying to create an attachment for bug #%s" % bug_number - return NotHandled + return if bug_number and not bug_open: if not seppuku_reopen_bug(poster, reopen, product, component, bug_number, bugname, text): @@ -390,6 +390,4 @@ python seppuku_eventhandler() { if bug_number: bb.data.setVar('OESTATS_BUG_NUMBER', bug_number, event.data) bb.data.setVar('OESTATS_BUG_TRACKER', "http://bugs.openembedded.net/", event.data) - - return NotHandled } diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index a45c1e679b..7ccc1f2bb4 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -378,14 +378,12 @@ def tinder_do_tinder_report(event): addhandler tinderclient_eventhandler python tinderclient_eventhandler() { from bb import note, error, data - from bb.event import NotHandled, getName + from bb.event import getName if e.data is None or getName(e) == "MsgNote": - return NotHandled + return do_tinder_report = data.getVar('TINDER_REPORT', e.data, True) if do_tinder_report and do_tinder_report == "1": tinder_do_tinder_report(e) - - return NotHandled } diff --git a/conf/collections.inc b/conf/collections.inc index 0572568f06..a69ffed687 100644 --- a/conf/collections.inc +++ b/conf/collections.inc @@ -178,6 +178,4 @@ python collections_eh () { if getName(e) == "ConfigParsed": collections_setup(e.data) - - return NotHandled } diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index dcab24b18a..79d1fd1d11 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -36,7 +36,7 @@ PREFERRED_VERSION_pango-native = "1.24.4" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" -PREFERRED_VERSION_python = "2.6.2" +PREFERRED_VERSION_python = "2.6.4" PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}" diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index 6ea8c90a8f..23424a2b1a 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -10,7 +10,8 @@ # # This *must* be removed after initial testing is completed. MJW 08-Dec-2008 # -PREFERRED_VERSION_linux-ixp4xx = "2.6.27.8+svnr${SRCREV}" +SRCREV_pn-linux-ixp4xx ?= "1089" +PREFERRED_VERSION_linux-ixp4xx = "2.6.27.8+svnr${SRCREV_pn-linux-ixp4xx}" # #===============================================================================# #===============================================================================# diff --git a/conf/machine/imote2.conf b/conf/machine/imote2.conf index 33e5a65799..24da0d0678 100644 --- a/conf/machine/imote2.conf +++ b/conf/machine/imote2.conf @@ -17,6 +17,6 @@ SERIAL_CONSOLE = "115200 ttyS2" require conf/machine/include/tune-xscale.inc -ROOT_FLASH_SIZE ?= "32" +ROOT_FLASH_SIZE ?= "30" MACHINE_FEATURES = "kernel26 usbgadget alsa iwmmxt" diff --git a/contrib/angstrom/omap3-mkcard.sh b/contrib/angstrom/omap3-mkcard.sh index d8b5b4373d..1cf681762d 100755 --- a/contrib/angstrom/omap3-mkcard.sh +++ b/contrib/angstrom/omap3-mkcard.sh @@ -1,5 +1,5 @@ #! /bin/sh -# mkcard.sh v0.4 +# mkcard.sh v0.5 # (c) Copyright 2009 Graeme Gregory <dp@xora.org.uk> # Licensed under terms of GPLv2 # @@ -30,10 +30,14 @@ echo ,9,0x0C,* echo ,,,- } | sfdisk -D -H 255 -S 63 -C $CYLINDERS $DRIVE +sleep 1 + if [ -b ${DRIVE}1 ]; then + umount ${DRIVE}1 mkfs.vfat -F 32 -n "boot" ${DRIVE}1 else if [ -b ${DRIVE}p1 ]; then + umount ${DRIVE}p1 mkfs.vfat -F 32 -n "boot" ${DRIVE}p1 else echo "Cant find boot partition in /dev" @@ -41,9 +45,11 @@ else fi if [ -b ${DRIVE}2 ]; then + umount ${DRIVE}2 mke2fs -j -L "rootfs" ${DRIVE}2 else if [ -b ${DRIVE}p2 ]; then + umount ${DRIVE}p2 mke2fs -j -L "rootfs" ${DRIVE}p2 else echo "Cant find rootfs partition in /dev" diff --git a/recipes/abiword/abiword_2.8.3.bb b/recipes/abiword/abiword_2.8.3.bb index 60eaa227ec..637a1284b9 100644 --- a/recipes/abiword/abiword_2.8.3.bb +++ b/recipes/abiword/abiword_2.8.3.bb @@ -1,7 +1,9 @@ require abiword-2.5.inc -DEPENDS += " libwmf-native gtkmathview " +DEPENDS += " loudmouth libwmf-native gtkmathview " RCONFLICTS_${PN} = "abiword-embedded" +PR = "r1" + SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=abiword \ file://autogen-common.sh \ file://nodolt.patch;patch=1" @@ -11,6 +13,7 @@ SRC_URI[abiword.sha256sum] = "b74f7ba5852e6225dd1fb52be266eaa33149fb24210b33b5d8 EXTRA_OECONF = " --disable-static \ --enable-plugins \ + --without-gnomevfs \ --enable-collab-backend-xmpp \ --enable-collab-backend-tcp \ --enable-collab-backend-service \ diff --git a/recipes/beep/beep_1.2.2.bb b/recipes/beep/beep_1.2.2.bb index e3ffdce22a..5de2669cac 100644 --- a/recipes/beep/beep_1.2.2.bb +++ b/recipes/beep/beep_1.2.2.bb @@ -3,18 +3,15 @@ DESCRIPTION = "A console utility to make a beep noise" SECTION = "console/utils" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://johnath.com/beep/beep-${PV}.tar.gz" SRC_URI += "file://linux-input.patch;patch=1" S = "${WORKDIR}/beep-${PV}" -PACKAGES += "${PN} ${PN}-doc" - -inherit autotools EXTRA_OEMAKE += 'CC="${CC}"' -EXTRA_OEMAKE += 'FLAGS="${CFLAGS}"' +EXTRA_OEMAKE += 'FLAGS="${CFLAGS} ${LDFLAGS}"' # slugos requires beep in boot BINDIR = "${bindir}" diff --git a/recipes/binutils/binutils_2.20.1.bb b/recipes/binutils/binutils_2.20.1.bb index 4f736f4e7d..e5e7f546c0 100644 --- a/recipes/binutils/binutils_2.20.1.bb +++ b/recipes/binutils/binutils_2.20.1.bb @@ -1,7 +1,7 @@ require binutils.inc LICENSE = "GPLv3" -INC_PR = "r0" +INC_PR = "r1" PR = "${INC_PR}.0" SRC_URI = "\ @@ -12,6 +12,7 @@ SRC_URI = "\ file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \ file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \ file://binutils-uclibc-gas-needs-libm.patch;patch=1 \ + file://binutils-x86_64_i386_biarch.patch;patch=1 \ " SRC_URI[tarball.sha256sum] = "228b84722d87e88e7fdd36869e590e649ab523a0800a7d53df906498afe6f6f8" diff --git a/recipes/binutils/binutils_2.20.bb b/recipes/binutils/binutils_2.20.bb index 686358234b..63186a4870 100644 --- a/recipes/binutils/binutils_2.20.bb +++ b/recipes/binutils/binutils_2.20.bb @@ -1,7 +1,7 @@ require binutils.inc LICENSE = "GPLv3" -INC_PR = "r1" +INC_PR = "r2" PR = "${INC_PR}.4" SRC_URI = "\ @@ -15,6 +15,7 @@ SRC_URI = "\ file://ld-stub-crash.patch;patch=1;pnum=0 \ file://binutils-arm-non-empty-know.patch;patch=1 \ file://binutils_unexport_LD_LIBRARY_PATH_for_CC_FOR_BUILD.patch;patch=1 \ + file://binutils-x86_64_i386_biarch.patch;patch=1 \ " # powerpc patches diff --git a/recipes/cups/cups-1.4.3/configure.patch b/recipes/cups/cups-1.4.3/configure.patch new file mode 100644 index 0000000000..877e8d3232 --- /dev/null +++ b/recipes/cups/cups-1.4.3/configure.patch @@ -0,0 +1,117 @@ +--- cups-1.4.3/configure.orig 2010-04-08 11:14:19.092296014 +0200 ++++ cups-1.4.3/configure 2010-04-08 11:19:02.661417938 +0200 +@@ -10940,114 +10940,6 @@ + OPTIM="-fPIC $OPTIM" + fi + +- # The -fstack-protector option is available with some versions of +- # GCC and adds "stack canaries" which detect when the return address +- # has been overwritten, preventing many types of exploit attacks. +- { echo "$as_me:$LINENO: checking if GCC supports -fstack-protector" >&5 +-echo $ECHO_N "checking if GCC supports -fstack-protector... $ECHO_C" >&6; } +- OLDCFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -fstack-protector" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && +- $as_test_x conftest$ac_exeext; then +- OPTIM="$OPTIM -fstack-protector" +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- CFLAGS="$OLDCFLAGS" +- +- # The -pie option is available with some versions of GCC and adds +- # randomization of addresses, which avoids another class of exploits +- # that depend on a fixed address for common functions. +- { echo "$as_me:$LINENO: checking if GCC supports -pie" >&5 +-echo $ECHO_N "checking if GCC supports -pie... $ECHO_C" >&6; } +- OLDCFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -pie -fPIE" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- PIEFLAGS="-pie -fPIE" +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$OLDCFLAGS" +- + if test "x$with_optim" = x; then + # Add useful warning options for tracking down problems... + OPTIM="-Wall -Wno-format-y2k $OPTIM" diff --git a/recipes/cups/cups-1.4.3/skip_tools.patch b/recipes/cups/cups-1.4.3/skip_tools.patch new file mode 100644 index 0000000000..272110146b --- /dev/null +++ b/recipes/cups/cups-1.4.3/skip_tools.patch @@ -0,0 +1,51 @@ +--- cups-1.4.3/ppdc/Makefile.orig 2010-04-07 12:38:56.650327699 +0200 ++++ cups-1.4.3/ppdc/Makefile 2010-04-07 12:40:05.842418876 +0200 +@@ -243,8 +243,8 @@ + $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ + libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \ + $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) +- echo Generating localization strings... +- ./genstrings >sample.c ++# echo Generating localization strings... ++# ./genstrings >sample.c + + + # +@@ -261,9 +261,9 @@ + $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ + ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ + $(COMMONLIBS) $(LIBZ) +- echo Testing PPD compiler... +- ./ppdc-static -l en,fr -I ../data foo.drv +- ./ppdc-static -l en,fr -z -I ../data foo.drv ++# echo Testing PPD compiler... ++# ./ppdc-static -l en,fr -I ../data foo.drv ++# ./ppdc-static -l en,fr -z -I ../data foo.drv + + + # +@@ -291,15 +291,15 @@ + $(COMMONLIBS) $(LIBZ) + echo Testing PPD importer... + $(RM) -r ppd ppd2 sample-import.drv +- ./ppdc-static -I ../data sample.drv +- ./ppdi-static -I ../data -o sample-import.drv ppd/* +- ./ppdc-static -I ../data -d ppd2 sample-import.drv +- if diff -qr ppd ppd2; then \ +- echo PPD import OK; \ +- else \ +- echo PPD import FAILED; \ +- exit 1; \ +- fi ++# ./ppdc-static -I ../data sample.drv ++# ./ppdi-static -I ../data -o sample-import.drv ppd/* ++# ./ppdc-static -I ../data -d ppd2 sample-import.drv ++# if diff -qr ppd ppd2; then \ ++# echo PPD import OK; \ ++# else \ ++# echo PPD import FAILED; \ ++# exit 1; \ ++# fi + |