Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

6 files changed, 54 insertions, 10 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f53f7d690f..9e026e44c4 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -329,7 +329,7 @@ STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/kernel"
 # Specific image creation and rootfs population info.
 ##################################################################
 
-IMAGE_ROOTFS = "${TMPDIR}/rootfs"
+IMAGE_ROOTFS = "${TMPDIR}/rootfs/${PN}"
 IMAGE_BASENAME = "${PN}"
 IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
 IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 57ed6fabe3..3e621fce0a 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2738,6 +2738,10 @@ sha256=1c46b6e219aec9bbd3286e9366de7e6dd05f68ed33b7487fbd211397c890fc40
 md5=5919d6383cd9446f8b90fdca748dc961
 sha256=e5e592de95f50a1569d3e4a95c8b955a2535e265e24869e3ce30e19b0949b465
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.37.tar.gz]
+md5=c1106f56f8e5562cf7c49d3455d2c5f7
+sha256=2bfc5db7703cbcaaa4be2576609136450e1dac5d4782707dd0dc81754e3c2489
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
 md5=2aa806940d2c841e57a9b2ab7302b750
 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
@@ -5850,6 +5854,10 @@ sha256=517fa062d7b2d367f931a1c6ebb2bef84907077f0ce3f0c899e34490bbea9338
 md5=e97c609af171cceb85d08f366406374a
 sha256=112ba595859ad6e42f5ad522ada27a08da7702e3ea8c84df48ae1c5d6177ae8e
 
+[http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz]
+md5=3e466375b930ec22be44f1041e77b55d
+sha256=9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c
+
 [http://sdgsystems.com/download/fbvncserver-0.9.4.tar.gz]
 md5=01a37f17857641253541307f59dd8cc5
 sha256=e22ed10ecba059904649f344be260512fdb3cbecbd95ca965f8b5cc3ea1785b5
@@ -17466,6 +17474,10 @@ sha256=3ed39e1dc74b4e1adb3d8a3430b18bcfd19d21406375faf420cbdcd5499a4594
 md5=7a1e7424b346ee0a0b719217a1081cfd
 sha256=c11daf4e0baf1bc70d30411944f9a3238d61e3c1972c33443dbe0cb078cfe2d7
 
+[http://downloads.sourceforge.net/opalvoip/opal-3.6.1.tar.bz2]
+md5=c2b4f12822cef2182267ea0d020bddf6
+sha256=e6b48a294b35449c851c2a6ea6969041ed7f4148e92b3faa03a330b7bb5a59af
+
 [http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz]
 md5=641cf53761f35ee979f3e888614797a0
 sha256=723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe
@@ -19170,6 +19182,10 @@ sha256=c9ef4267490507fc9699634551b50c0c1c225d48e0c095a81be6fa5a1fa96a3a
 md5=7d8dcd999827d51ad4a15afe74aad181
 sha256=c99897464bd07c73dbb72095a9806ddc0c26141230e34b181d7e742e78259e4b
 
+[http://downloads.sourceforge.net/opalvoip/ptlib-2.6.1.tar.bz2]
+md5=122ab96fcc44110ce05153f259b3285a
+sha256=b8301389c1ee9968df8075942061665e33198d3865f92d8fb26e519068517305
+
 [http://pypi.python.org/packages/source/p/ptrace/ptrace-0.3.2.tar.gz]
 md5=8108c2474bef16d126e956dce3c5073b
 sha256=634fe75e195179adafb6218040724f38252bd0fc8f796bb3e3e9bdba065890c5
@@ -20034,6 +20050,10 @@ sha256=05d06b93f95092f1318634fca24f0c2d0a1252c9f1dc2fbb427b07e8ecbb4f39
 md5=3bd081c940c8580ecaabc1bd898e48f0
 sha256=4f6319c6031af47ef81fef08f465e4db61c0f169f5eb9bbc8f060cc3db3ffafa
 
+[ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.5.1.tar.bz2]
+md5=43e7384c59625af0830032348f672a1d
+sha256=f525ad885675f4c2413d67d9a5efaf7c34862d88c796fe7e7e2d05a42a1a66c8
+
 [ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.5.tar.bz2]
 md5=05d04688c0c0230ed54e89102d689ca4
 sha256=aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96
@@ -20086,6 +20106,10 @@ sha256=79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
 md5=d6d1555b7a074e0a746f6247af402e11
 sha256=61831af6b71c7bd4e1ef542071225835d8c741fa8e079bceab8c83f712e396a1
 
+[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.1.tar.gz]
+md5=f81a94e2ab7713b2d375d4e5cfc8e051
+sha256=aa3f5a459d042681a321f33e8d99468337a00674d68b8a512e0078625c1f51da
+
 [ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.0.tar.gz]
 md5=9519eccf0638c9962f73a7b20da77e0e
 sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 25163127ed..740ff31435 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -99,9 +99,8 @@ ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
 # Blackfin has its on gcc
 ANGSTROM_GCC_VERSION_bfin			= "4.1.2"
 
-ANGSTROM_GCC_VERSION_armv7a		= "4.3.1" 
-
-ANGSTROM_GCC_VERSION_486sx = "4.3.2"
+ANGSTROM_GCC_VERSION_486sx      = "4.3.3"
+ANGSTROM_GCC_VERSION_armv7a     = "4.3.3" 
 
 # Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
 #KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
@@ -110,10 +109,14 @@ ANGSTROM_GCC_VERSION_486sx = "4.3.2"
 ANGSTROM_GCC_VERSION_avr32		?= "4.2.2"
 
 #Everybody else can just use this: 
-ANGSTROM_GCC_VERSION 			?= "4.2.4"
-PREFERRED_VERSION_binutils	?= "2.18.50.0.7"
-PREFERRED_VERSION_binutils-cross 	?= "2.18.50.0.7"
-PREFERRED_VERSION_binutils-cross-sdk 	?= "2.18.50.0.7"
+ANGSTROM_GCC_VERSION                     ?= "4.2.4"
+
+#2.19.51.0.3
+ANGSTROM_BINUTILS_VERSION                ?= "2.18.50.0.7"
+
+PREFERRED_VERSION_binutils               ?= "${ANGSTROM_BINUTILS_VERSION}"
+PREFERRED_VERSION_binutils-cross         ?= "${ANGSTROM_BINUTILS_VERSION}"
+PREFERRED_VERSION_binutils-cross-sdk     ?= "${ANGSTROM_BINUTILS_VERSION}"
 
 PREFERRED_VERSION_gcc                    ?= "${ANGSTROM_GCC_VERSION}"
 PREFERRED_VERSION_gcc-cross              ?= "${ANGSTROM_GCC_VERSION}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index a26dbe3214..82d216ace5 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -111,6 +111,7 @@ SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3758"
+SRCREV_pn-linux-bug ?= "8918"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1089"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
@@ -154,7 +155,7 @@ SRCREV_pn-osb-browser ?= "125"
 SRCREV_pn-osb-jscore ?= "117"
 SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
-SRCREV_pn-openezx-kernel ?= "87c2ff2531fd4a5f6799a80b339859dd3ebf4191"
+SRCREV_pn-openezx-kernel ?= "b53ea978de2a628f61f8e24e584c11dc90df3d39"
 SRCREV_pn-openmoko-agpsui ?= "7"
 SRCREV_pn-openmoko-alsa-scenarios ?= "4732"
 SRCREV_pn-openmoko-appearance ?= "3262"
diff --git a/conf/machine/bug.conf b/conf/machine/bug.conf
new file mode 100644
index 0000000000..cec3d5b785
--- /dev/null
+++ b/conf/machine/bug.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: Bug Labs BUG Computer
+#@DESCRIPTION: Machine configuration for the BUG base unit.
+TARGET_ARCH = "arm"
+
+MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw"
+PREFERRED_PROVIDER_virtual/kernel = "linux-bug"
+
+MACHINE_FEATURES = "kernel26 screen touchscreen hotplug alsa wifi usbhost usbgadget"
+SERIAL_CONSOLE = "-L 115200 ttymxc4"
+
+CPU_FEATURES += "vfp"
+
+require conf/machine/include/tune-arm1136jf-s.inc
+
+KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index fc801aa2a7..5d6d9ffbff 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r30" 
+MACHINE_KERNEL_PR = "r31" 
 
 KERNEL_IMAGETYPE = "uImage"