diff options
72 files changed, 1184 insertions, 188 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index d0083bdc54..fec7622f18 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -825,8 +825,11 @@ def base_after_parse(d): if (old_arch == mach_arch): # Nothing to do return - if (bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1) == '0'): + override = bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1) + + if not override or override == '0': return + paths = [] for p in [ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ]: paths.append(bb.data.expand(os.path.join(p, mach_arch), d)) diff --git a/classes/image.bbclass b/classes/image.bbclass index 5f1dfa2dce..101b53307a 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -89,9 +89,9 @@ fakeroot do_rootfs () { for type in ${IMAGE_FSTYPES}; do if test -z "$FAKEROOTKEY"; then - fakeroot -i ${TMPDIR}/fakedb.image bbimage -t $type -e ${FILE} + fakeroot -i ${TMPDIR}/fakedb.image ${PYTHON} `which bbimage` -t $type -e ${FILE} else - bbimage -n "${IMAGE_NAME}" -t "$type" -e "${FILE}" + ${PYTHON} `which bbimage` -n "${IMAGE_NAME}" -t "$type" -e "${FILE}" fi cd ${DEPLOY_DIR_IMAGE}/ diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index cd6e04731e..3256977517 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -24,7 +24,7 @@ def get_pkgconfig_mangle(d): do_install_append () { for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do - sed -i ${@get_pkgconfig_mangle(d)} ${pc} + sed -i ${@get_pkgconfig_mangle(d)} -e 's:${D}::g' ${pc} done } @@ -32,6 +32,6 @@ do_stage_append () { for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do pcname=`basename $pc` install -d ${PKG_CONFIG_PATH} - cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_PATH}/$pcname + cat $pc | sed ${@get_pkgconfig_mangle(d)} -e 's:${D}${libdir}\S*:${STAGING_LIBDIR}:g' -e 's:${D}${prefix}/include\S*:${STAGING_INCDIR}:g' > ${PKG_CONFIG_PATH}/$pcname done } diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index a0da0667dd..016b0d500b 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -111,6 +111,16 @@ python check_sanity_eventhandler() { from bb import note, error, data, __version__ from bb.event import getName + 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(bb.__version__) > LooseVersion("1.8.6")): + if getName(e) == "ConfigParsed": + check_sanity(e) + return NotHandled + if getName(e) == "BuildStarted": check_sanity(e) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 77d6c1ee83..e305dc3251 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -246,6 +246,7 @@ export RANLIB = "${HOST_PREFIX}ranlib" export STRIP = "${HOST_PREFIX}strip" export OBJCOPY = "${HOST_PREFIX}objcopy" export OBJDUMP = "${HOST_PREFIX}objdump" +PYTHON = "${@sys.executable}" export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}" @@ -462,6 +463,10 @@ IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" IMAGE_ROOTFS_SIZE_ext3 ?= "65536" IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536" +# Forcefully set CACHE now so future changes to things like +# MACHINE don't change the path to the cache +CACHE := "${CACHE}" + ################################################################## # Magic Cookie for SANITY CHECK ################################################################## diff --git a/conf/distro/include/preferred-opie-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc index da946d4784..1f39916f4f 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.3.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.3.inc @@ -208,4 +208,4 @@ PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}" PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}" PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}" -PREFERRED_VERSION_konqueror-embedded = "20060404" +PREFERRED_VERSION_konqueror-embedded = "20070212" diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.conf index 565f37b43f..821ebc4c03 100644 --- a/conf/machine/include/palm.conf +++ b/conf/machine/include/palm.conf @@ -41,7 +41,6 @@ module_autoload_pcmcia = "pcmcia" module_autoload_pcmcia_core = "pcmcia-core" module_autoload_pda_power = "pda_power" module_autoload_pxa2xx_core = "pxa2xx-core" -module_autoload_pxapwm_bl = "pxapwm_bl" module_autoload_snd = "snd" module_autoload_snd-ac97-codec = "snd-ac97-codec" module_autoload_snd-mixer-oss = "snd-mixer-oss" diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf index 7adb352ba4..3d1d90fbd8 100644 --- a/conf/machine/palmld.conf +++ b/conf/machine/palmld.conf @@ -24,7 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS += "\ kernel-module-pcmcia-core \ kernel-module-pda-power \ kernel-module-pxa2xx-core \ - kernel-module-pxapwm-bl \ kernel-module-snd-pxa2xx-ac97 \ kernel-module-snd-pxa2xx-pcm \ " diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf index 46e5fafdb5..4d1032dae8 100644 --- a/conf/machine/palmt650.conf +++ b/conf/machine/palmt650.conf @@ -10,8 +10,8 @@ SERIAL_CONSOLE = "115200 ttyS1" GUI_MACHINE_CLASS = "bigscreen" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ - kernel-module-pxapwm-bl \ +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-snd-pxa2xx-ac97 \ + kernel-module-pxa27x-keyboard \ kernel-module-wm97xx-ts" module_autoload_g_ether = "g_ether" diff --git a/conf/machine/palmt680.conf b/conf/machine/palmt680.conf new file mode 100644 index 0000000000..b5e8aebb54 --- /dev/null +++ b/conf/machine/palmt680.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: Palm Treo 680 +#@DESCRIPTION: Machine configuration for the Palm TX + +require conf/machine/include/palm.conf + +ROOT_FLASH_SIZE = "100" + +SERIAL_CONSOLE = "115200 ttyS0" + +GUI_MACHINE_CLASS = "bigscreen" + +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ + kernel-module-wm97xx-ts" diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf index f4fcb405c5..b1139c21fa 100644 --- a/conf/machine/palmtc.conf +++ b/conf/machine/palmtc.conf @@ -12,5 +12,3 @@ SERIAL_CONSOLE = "115200 ttyS0" GUI_MACHINE_CLASS = "bigscreen" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxapwm-bl" - diff --git a/conf/machine/palmtt5.conf b/conf/machine/palmtt5.conf index aedaf4ba30..d2de3fa87b 100644 --- a/conf/machine/palmtt5.conf +++ b/conf/machine/palmtt5.conf @@ -11,6 +11,5 @@ SERIAL_CONSOLE = "115200 ttyS0" GUI_MACHINE_CLASS = "bigscreen" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ - kernel-module-pxapwm-bl \ kernel-module-wm97xx-ts \ kernel-module-palmt5-battery" diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf index d9b934a306..9f1f079cdc 100644 --- a/conf/machine/palmtx.conf +++ b/conf/machine/palmtx.conf @@ -14,6 +14,5 @@ ROOT_FLASH_SIZE = "100" SERIAL_CONSOLE = "115200 ttyS0" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ - kernel-module-pxapwm-bl \ kernel-module-wm97xx-ts \ kernel-module-palmtx-battery" diff --git a/packages/blassic/.mtn2git_empty b/packages/blassic/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/blassic/.mtn2git_empty diff --git a/packages/blassic/blassic_0.10.1.bb b/packages/blassic/blassic_0.10.1.bb new file mode 100644 index 0000000000..52b5ae4644 --- /dev/null +++ b/packages/blassic/blassic_0.10.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "classic basic interpreter" +LICENSE = "GPLv2" +DEPENDS = "ncurses" + +SRC_URI = "http://www.blassic.org/bin/blassic-${PV}.tgz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-graphics=yes" + + diff --git a/packages/bluez/bluez-gnome_0.10.bb b/packages/bluez/bluez-gnome_0.10.bb new file mode 100644 index 0000000000..d50e8e5fde --- /dev/null +++ b/packages/bluez/bluez-gnome_0.10.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "BLuetooth configuration applet" +LICENSE = "GPL+LGPL" + +DEPENDS = "dbus-glib gconf libnotify gtk+" + +SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" + +inherit autotools pkgconfig gconf + +FILES_${PN} += "${datadir}/gconf" + diff --git a/packages/bluez/bluez-gnome_cvs.bb b/packages/bluez/bluez-gnome_cvs.bb index 65412663a0..ea5bbe6c2f 100644 --- a/packages/bluez/bluez-gnome_cvs.bb +++ b/packages/bluez/bluez-gnome_cvs.bb @@ -8,7 +8,7 @@ DEPENDS = "dbus-glib gconf libnotify gtk+" SRC_URI = "cvs://anonymous@cvs.bluez.org/cvsroot/bluez;module=gnome \ " -PV = "0.9+cvs${SRCDATE}" +PV = "0.10+cvs${SRCDATE}" S = "${WORKDIR}/gnome" inherit autotools pkgconfig gconf diff --git a/packages/bluez/bluez-gnome_git.bb b/packages/bluez/bluez-gnome_git.bb index ac772f8825..e16fee109d 100644 --- a/packages/bluez/bluez-gnome_git.bb +++ b/packages/bluez/bluez-gnome_git.bb @@ -1,12 +1,14 @@ DESCRIPTION = "BLuetooth configuration applet" LICENSE = "GPL+LGPL" +DEFAULT_PREFERENCE = "-2" + DEPENDS = "dbus-glib gconf libnotify gtk+" SRC_URI = "git://people.freedesktop.org/~hadess/bluez-gnome;protocol=git \ file://pkgconfig-add-gthread.patch;patch=1 " -PV = "0.9+git${SRCDATE}" +PV = "0.10+git${SRCDATE}" S = "${WORKDIR}/git" inherit autotools pkgconfig gconf diff --git a/packages/bluez/bluez-hcidump_1.38.bb b/packages/bluez/bluez-hcidump_1.38.bb new file mode 100644 index 0000000000..877c8db33c --- /dev/null +++ b/packages/bluez/bluez-hcidump_1.38.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" +S = "${WORKDIR}/bluez-hcidump-${PV}" + +EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" + +inherit autotools diff --git a/packages/bluez/bluez-libs_3.13.bb b/packages/bluez/bluez-libs_3.13.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.13.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/bluez/bluez-utils_3.13.bb b/packages/bluez/bluez-utils_3.13.bb new file mode 100644 index 0000000000..5ea1429641 --- /dev/null +++ b/packages/bluez/bluez-utils_3.13.bb @@ -0,0 +1,114 @@ +require bluez-utils.inc + +DEPENDS += "glib-2.0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + " +PR = "r0" + +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-alsa \ + --enable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +# The config options are explained below: + +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +# --enable-glib For systems that use and install GLib anyway +# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server + +#Following services can be enabled so far: +# --enable-network +# --enable-serial +# --enable-input +# --enable-audio +# --enable-echo + +#There is no need to modify any init script. They will be started +#automatically or on demand. Only /etc/bluetooth/*.service files should +#be patched to change name or the autostart value. +# --enable-configfile +# --enable-initscripts + +#For even smaller -doc packages +# --disable-manpages +# --disable-pcmciarules + +#I haven't seen any embedded device with HID proxy support. So simply +#disable it: +# --disable-hid2hci + + +PACKAGES =+ "${PN}-compat ${PN}-alsa" + +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_${PN} = " \ + ${base_sbindir}/hcid \ + ${libdir}/bluetooth \ + ${sysconfdir}/init.d/bluetooth \ + ${sysconfdir}/bluetooth/*.service \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default \ + ${sysconfdir}/dbus-1 \ + ${base_sbindir}/hciattach \ + " + +FILES_${PN}-dbg += " \ + ${libdir}/bluetooth/.debug \ + ${libdir}/cups/backend/.debug \ + ${libdir}/alsa-lib/.debug \ + " + +FILES_${PN}-compat = " \ + ${base_bindir}/sdptool \ + ${base_bindir}/dund \ + ${base_bindir}/rctest \ + ${base_bindir}/ciptool \ + ${base_bindir}/l2test \ + ${base_bindir}/rfcomm \ + ${base_bindir}/hcitool \ |