diff options
22 files changed, 101 insertions, 26 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 2f74104185..089cd5acd3 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -424,13 +424,21 @@ python base_do_clean() { os.system('rm -f '+ dir) } +#Uncomment this for bitbake 1.8.12 +#addtask rebuild after do_${BB_DEFAULT_TASK} addtask rebuild do_rebuild[dirs] = "${TOPDIR}" do_rebuild[nostamp] = "1" python base_do_rebuild() { """rebuild a package""" - bb.build.exec_task('do_clean', d) - bb.build.exec_task('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1), d) + from bb import __version__ + try: + from distutils.version import LooseVersion + except ImportError: + def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1 + if (LooseVersion(__version__) < LooseVersion('1.8.11')): + bb.build.exec_func('do_clean', d) + bb.build.exec_task('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1), d) } addtask mrproper @@ -442,7 +450,7 @@ python base_do_mrproper() { if dir == '/': bb.build.FuncFailed("wrong DATADIR") bb.debug(2, "removing " + dir) os.system('rm -rf ' + dir) - bb.build.exec_task('do_clean', d) + bb.build.exec_func('do_clean', d) } addtask fetch @@ -663,6 +671,17 @@ python base_eventhandler() { if pesteruser: bb.fatal('The following variable(s) were not set: %s\nPlease set them directly, or choose a MACHINE or DISTRO that sets them.' % ', '.join(pesteruser)) + # + # Handle removing stamps for 'rebuild' task + # + if name.startswith("StampUpdate"): + for (fn, task) in e.targets: + #print "%s %s" % (task, fn) + if task == "do_rebuild": + dir = "%s.*" % e.stampPrefix[fn] + bb.note("Removing stamps: " + dir) + os.system('rm -f '+ dir) + if not data in e.__dict__: return NotHandled @@ -900,7 +919,19 @@ def base_after_parse(d): return python () { + import bb + from bb import __version__ base_after_parse(d) + + # Remove this for bitbake 1.8.12 + try: + from distutils.version import LooseVersion + except ImportError: + def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1 + if (LooseVersion(__version__) >= LooseVersion('1.8.11')): + deps = bb.data.getVarFlag('do_rebuild', 'deps', d) or [] + deps.append('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1)) + bb.data.setVarFlag('do_rebuild', 'deps', deps, d) } def check_app_exists(app, d): diff --git a/classes/rm_work.bbclass b/classes/rm_work.bbclass index 4efd39c557..97de5e2774 100644 --- a/classes/rm_work.bbclass +++ b/classes/rm_work.bbclass @@ -25,3 +25,23 @@ do_rm_work_all () { } do_rm_work_all[recrdeptask] = "do_rm_work" addtask rm_work_all after do_rm_work + + +addhandler rmwork_stampfixing_eventhandler +python rmwork_stampfixing_eventhandler() { + from bb.event import getName + import os + + if getName(e) == "StampUpdate": + for (fn, task) in e.targets: + if task == 'rm_work_all': + continue + stamp = "%s.do_rm_work" % e.stampPrefix[fn] + if os.path.exists(stamp): + dir = "%s.*" % e.stampPrefix[fn] + bb.note("Removing stamps: " + dir) + os.system('rm -f '+ dir) + + return NotHandled +} + diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass index 834bee34b4..2e097a812e 100644 --- a/classes/seppuku.bbclass +++ b/classes/seppuku.bbclass @@ -303,7 +303,7 @@ python seppuku_eventhandler() { if name == "PkgFailed": if not bb.data.getVar('SEPPUKU_AUTOBUILD', data, True) == "0": - build.exec_task('do_clean', data) + build.exec_func('do_clean', data) elif name == "TaskFailed": cj = cookielib.CookieJar() opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj)) diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index bc004efb26..0b7fc1d843 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -328,7 +328,7 @@ def tinder_do_tinder_report(event): log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('PF', event.data, True) elif name == "PkgFailed": if not data.getVar('TINDER_AUTOBUILD', event.data, True) == "0": - build.exec_task('do_clean', event.data) + build.exec_func('do_clean', event.data) log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('PF', event.data, True) status = 200 # remember the failure for the -k case diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 1c6d81023a..2ff0809324 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -30,6 +30,7 @@ SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" +SRCREV_pn-gpio ?= "4112" SRCREV_pn-gsm0710muxd ?= "77" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "56" diff --git a/packages/gsm/files/default b/packages/gsm/files/default index 467bd339eb..cf36460fac 100644 --- a/packages/gsm/files/default +++ b/packages/gsm/files/default @@ -13,6 +13,7 @@ case `machine_id` in GSM_RES="/sys/bus/platform/devices/neo1973-pm-gsm.0/reset" fi GSM_DEV="/dev/ttySAC0" + GSM_DL="/sys/devices/platform/neo1973-pm-gsm.0/download" ;; "htc_apache"|"htc_blueangel"|"htc_universal") GSMD_OPTS="-s 115200 -F" diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd index 9257b901ad..72f66a17ad 100644 --- a/packages/gsm/files/gsmd +++ b/packages/gsm/files/gsmd @@ -13,6 +13,8 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin case "$1" in start) + [ -n "$GSM_DL" ] && echo "1" >$GSM_DL; + [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 ) [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 ) [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 ) diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc index a6b6fb7a6a..5e47847d74 100644 --- a/packages/gsm/gsmd.inc +++ b/packages/gsm/gsmd.inc @@ -5,7 +5,7 @@ SECTION = "libs/gsm" PROVIDES += "gsmd" RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" PV = "0.1+svnr${SRCREV}" -PR = "r41" +PR = "r42" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ diff --git a/packages/kexec/kexec-tools-static_1.101.bb b/packages/kexec/kexec-tools-static_1.101.bb index 21c212c2db..5fa51b2e70 100644 --- a/packages/kexec/kexec-tools-static_1.101.bb +++ b/packages/kexec/kexec-tools-static_1.101.bb @@ -1,7 +1,7 @@ # the binaries are statical linked against klibc require kexec-tools.inc -PR = "r2" +PR = "r3" DEPENDS = "klibc" SRC_URI += "file://kexec-klibc.patch;patch=1" @@ -18,6 +18,6 @@ export LDFLAGS="" PACKAGES =+ "kexec-static kdump-static" -FILES_kexec-klibc = "${sbindir}/kexec" -FILES_kdump-klibc = "${sbindir}/kdump" +FILES_kexec-static = "${sbindir}/kexec" +FILES_kdump-static = "${sbindir}/kdump" diff --git a/packages/klibc/klibc-common.inc b/packages/klibc/klibc-common.inc index 87f806dfe2..76e393796a 100644 --- a/packages/klibc/klibc-common.inc +++ b/packages/klibc/klibc-common.inc @@ -16,8 +16,8 @@ KLIBC_ARCH_mipsel = 'mips' # could be fixed, but for the moment: ARM_INSTRUCTION_SET = "arm" -SRC_URI_append_linux-gnueabi = "\ - file://klibc-config-eabi.patch;patch=1" +SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch;patch=1" +SRC_URI_append_linux-uclibcgnueabi = "file://klibc-config-eabi.patch;patch=1" EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ 'CROSS_COMPILE=${TARGET_PREFIX}' \ diff --git a/packages/klibc/klibc-utils-static_1.5.bb b/packages/klibc/klibc-utils-static_1.5.bb index cac8c1c67f..f9c9923212 100644 --- a/packages/klibc/klibc-utils-static_1.5.bb +++ b/packages/klibc/klibc-utils-static_1.5.bb @@ -1,6 +1,6 @@ require klibc-common.inc -PR = "r5" +PR = "r6" # We only want the static utils. klibc build both. So we install only what we want. diff --git a/packages/klibc/klibc_1.5.bb b/packages/klibc/klibc_1.5.bb index 524437f9f9..71eed9f8da 100644 --- a/packages/klibc/klibc_1.5.bb +++ b/packages/klibc/klibc_1.5.bb @@ -1,2 +1,2 @@ require klibc.inc -PR = "r3" +PR = "r4" diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc index 7f7f205613..4b13980cc4 100644 --- a/packages/pulseaudio/pulse.inc +++ b/packages/pulseaudio/pulse.inc @@ -84,7 +84,7 @@ pkg_postinst_${PN}-server() { grep -q pulse: /etc/passwd || \ adduser --disabled-password --home=/var/run/pulse --system \ --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse - adduser pulse audio + addgroup pulse audio /etc/init.d/populate-volatile.sh update } diff --git a/packages/pulseaudio/pulseaudio_0.9.6.bb b/packages/pulseaudio/pulseaudio_0.9.6.bb index aa07afe6fe..56b717aac7 100644 --- a/packages/pulseaudio/pulseaudio_0.9.6.bb +++ b/packages/pulseaudio/pulseaudio_0.9.6.bb @@ -1,4 +1,4 @@ require pulse.inc -PR = "r6" +PR = "r7" diff --git a/packages/pulseaudio/pulseaudio_0.9.9.bb b/packages/pulseaudio/pulseaudio_0.9.9.bb index b884c27dd6..7e63b61eb3 100644 --- a/packages/pulseaudio/pulseaudio_0.9.9.bb +++ b/packages/pulseaudio/pulseaudio_0.9.9.bb @@ -8,7 +8,7 @@ SRC_URI += "\ file://fix-dbus-without-hal.patch;patch=1 \ " -PR = "r2" +PR = "r3" # problems w/ pulseaudio 0.9.9 atm: # 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime) diff --git a/packages/python/python-dbus_0.82.4.bb b/packages/python/python-dbus_0.82.4.bb index 9f00c64701..c17f1c766b 100644 --- a/packages/python/python-dbus_0.82.4.bb +++ b/packages/python/python-dbus_0.82.4.bb @@ -2,9 +2,9 @@ DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for i SECTION = "devel/python" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" LICENSE = "MIT" -DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python" -RDEPENDS = "dbus python-threading python-io python-stringold python-logging" -PR = "ml0" +DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" +RDEPENDS = "python-threading python-io python-stringold python-logging" +PR = "ml1" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" S = "${WORKDIR}/dbus-python-${PV}" diff --git a/packages/s3c2410-utils/.mtn2git_empty b/packages/s3c24xx-utils/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/s3c2410-utils/.mtn2git_empty +++ b/packages/s3c24xx-utils/.mtn2git_empty diff --git a/packages/s3c2410-utils/s3c2410-boot-usb-native_svn.bb b/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb index c7b89647f5..c7b89647f5 100644 --- a/packages/s3c2410-utils/s3c2410-boot-usb-native_svn.bb +++ b/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb diff --git a/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb b/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb new file mode 100644 index 0000000000..085339a9c1 --- /dev/null +++ b/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform" +SECTION = "console/utils" +LICENSE = "GPL" +PV = "1.0+svn${SRCDATE}" +PR = "r0" + +SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http" +S = "${WORKDIR}/gpio" + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio.c +} + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${PN} ${D}${sbindir} +} diff --git a/packages/s3c2410-utils/sjf2410-linux-native_svn.bb b/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb index 60cce4a3e2..60cce4a3e2 100644 --- a/packages/s3c2410-utils/sjf2410-linux-native_svn.bb +++ b/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb index 7a9800f94a..737cf8ef0c 100644 --- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb +++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb @@ -4,12 +4,12 @@ LICENSE = "GPL" SECTION = "bootloader" PRIORITY = "optional" -UBOOT_UPSTREAM_REV = "0ec595243dc99edcd248bbcfbfd5a1dc860bde89" -UBOOT_OPENMOKO_REV = "3817" -UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4" +UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18858c451bcdc63d45888e6e" +UBOOT_OPENMOKO_REV = "4118" +UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5" LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}" PV = "1.3.1${LOCALVERSION}" -PR = "r1" +PR = "r3" PROVIDES = "virtual/bootloader" S = "${WORKDIR}/git" @@ -18,11 +18,11 @@ SRC_URI = "\ git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ - file://makefile-no-dirafter.patch;patch=1 \ - file://fix-data-abort-from-sd-ombug799.patch;patch=1 \ +# file://makefile-no-dirafter.patch;patch=1 \ +# file://fix-data-abort-from-sd-ombug799.patch;patch=1 \ " -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" TARGET_LDFLAGS = "" do_quilt() { diff --git a/packages/udev/files/network.sh b/packages/udev/files/network.sh index 5016328df4..182c26d86a 100644 --- a/packages/udev/files/network.sh +++ b/packages/udev/files/network.sh @@ -1,5 +1,8 @@ #!/bin/sh +# udevd does clearenv(). Export shell PATH to children. +export PATH + # Do not run when pcmcia-cs is installed test -x /sbin/cardctl && exit 0 |