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

3 files changed, 106 insertions, 15 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 2dc649c176..f20b9da5c0 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -538,6 +538,10 @@ sha256=5ed480cb76c91c2739ddba87f15437510e58c60dfdd7ead6f469149b2da94bb7
 md5=fc5e35645b75befae28c88b711b28ffb
 sha256=42d06febf4717dd43eb557027d1b00a484c22589793438778ed69449a073a3b8
 
+[http://kernel.org/pub/linux/libs/pam/library/Linux-PAM-1.1.0.tar.bz2]
+md5=9cda791c827dfcd9f2888caf0a64cc4a
+sha256=139b1abb0f1c402e443ad9083b5ff0512f4a5ae7bc806528e9d7eced13384ed7
+
 [http://ltt.polymtl.ca/packages/LinuxTraceToolkitViewer-0.8.41-12052006.tar.gz]
 md5=de139052f234cf54d714c960524bd5ef
 sha256=a21431358d7f2a5deb76b1a95ee80dc870b0dc2426d4860c61144343d48eff3e
@@ -2382,6 +2386,10 @@ sha256=dedf5325105f071e5d9f898fdb7337a7fe88a3a8a1f832a6056ba00477b8cc3d
 md5=068c1d220b07037e64caf87d4a7a0504
 sha256=260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950
 
+[http://avahi.org/download/avahi-0.6.25.tar.gz]
+md5=a83155a6e29e3988f07e5eea3287b21e
+sha256=9220d974f5515b8ccfa3900cd72cedcac0fa4cc87ca3c64405f7c55346cbba59
+
 [http://www.apache.org/dist/excalibur/avalon-framework/source/avalon-framework-api-4.3-src.tar.gz]
 md5=d4cffb4ba1d07bdc517ac6e322636495
 sha256=a4d56a053609ddfc77f6a42c3f15a11708d5e0eb29ffc60a40b87e4cc7331d47
@@ -6722,6 +6730,10 @@ sha256=402ca3641f1724f5a4ec1ac3e283cd1334bd85c4b5de7744bd267454ef31259e
 md5=136867f95c86f3988b7f825e874b85de
 sha256=d68b5988907e06cc37793489589f5545487a9b1bbe6444b7e2e16450bd1cb9ae
 
+[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.4/source/firefox-3.5.4.source.tar.bz2]
+md5=0b6ccb1e50d96b7127a18a69399fcf05
+sha256=b2b0a231aae105090948521a469c5019eb886f0562fa3315a49cebaf74f61be4
+
 [http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.5b4-candidates/build1/source/firefox-3.5b4-source.tar.bz2]
 md5=ff6bf463300cb56bcf750973b2af3d80
 sha256=b653f2fa8dfdd0a54a6b8c576769719cf9014ca6b09f8e9d351721a51766d95d
@@ -7458,6 +7470,10 @@ sha256=0934bd29fb2ad0367ea3bdfdce47537179f9af6aa960cbcc897c40da2e1a0ee3
 md5=585a65f61c2cd308ab45d5c514f695dc
 sha256=0934bd29fb2ad0367ea3bdfdce47537179f9af6aa960cbcc897c40da2e1a0ee3
 
+[http://ftp.gnu.org/gnu/freefont/freefont-ttf-20090104.tar.gz]
+md5=1128bb17763cde6990eacd5996f7def7
+sha256=2b8e7164b0c362d5c5e90275b25772514d76d5fda3d54c026445611e467d638e
+
 [http://dfn.dl.sourceforge.net/sourceforge/freeglut/freeglut-2.4.0.tar.gz]
 md5=6d16873bd876fbf4980a927cfbc496a1
 sha256=269f2d50ba30b381622eb36f20b552ad43a1b43d544b9075e484e7146e81b052
@@ -18882,6 +18898,10 @@ sha256=777ff60afa89426f0e52e49b0e7a7661ddb45b59d2ebbfdcbe07fd179e526ff3
 md5=49fc135e1cde90cd935c1229467fa37e
 sha256=33a878a8fc3efdd74519b09b4ec3d16fa9d3a0436b321c13344e5f3ab723c5e4
 
+[ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc1.tar.bz2]
+md5=049e93d78d5370351539c9a23b47e1af
+sha256=8e6823f4b92d88c837735322ca71199919406a2826bddae257c6e0f52d089cd7
+
 [ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc2.tar.bz2]
 md5=1e4be634b137e5b944c94b418d8c3791
 sha256=5cba470ccd60fec00be2bf7ef231f104dcea8275698fe70f5df398dbe2fe19fd
@@ -19454,6 +19474,10 @@ sha256=c986121e520897af6c326ece8a26eca87bdb4641a93913b63a5c29521cefaf66
 md5=f9adc013e0e4b26c992cc0ca05328f3d
 sha256=44ba0d99e1bf8fa2caf9f7a85d569e513208c0710c1ad00032e271289e87b63f
 
+[http://www.kernel.org/pub/linux/bluetooth/obexd-0.18.tar.gz]
+md5=5674f746b55439d32bc765d2c5baad16
+sha256=6dbabd9345967120ad21cc25489a6d244aed7975cee9297cc5716af4debc7228
+
 [http://downloads.sourceforge.net/openobex/obexftp-0.20.tar.gz]
 md5=085b9edc0504c0d79e7479a54e2018c5
 sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e
@@ -23882,6 +23906,10 @@ sha256=c7d7f2fb4a3903dd26a90df358f5757f2637c333cd6f6bf511f506a958349fa1
 md5=9b48fc595d7291fa8edddfafba2cb7a9
 sha256=28a6af2d1490374de26084e346bbd227586c0f6232dcf4cfebf80413adc7d932
 
+[http://download.berlios.de/slim/slim-1.3.1.tar.gz]
+md5=727d0acb24c0fbf0751134c37a9c895f
+sha256=acd7a4024bfd7c2a4f3cd5d77ffed4956d13727a8f554042126d0568defe0f77
+
 [http://downloads.sourceforge.net/slotsig/slotsig-0.6.tar.bz2]
 md5=dfe9f5d3f17075ec23eb923899ac5f24
 sha256=124499d3c5d2d44ab07b60c235547079044f3728fd3c907987900e270bd947f8
@@ -25414,6 +25442,10 @@ sha256=ad214a2692041f423d2150777c233b21cab2d108f849edc513192587ac63c9c2
 md5=768059a486ff73ae18595afab3b78a70
 sha256=f4d3b413a61bfe6895f7f87bbfbcc7159f66b1d73fc29a7380839802fbb01198
 
+[http://ftp.gnome.org/pub/GNOME/sources/tracker/0.6/tracker-0.6.95.tar.bz2]
+md5=a4edc8aa830070bd3f1d80a7df07c80c
+sha256=0fe42353117c62ccc9de3b3c9c11acf707a0702d30cd24b8d1cd1e2581dec339
+
 [http://downloads.sourceforge.net/transconnect/transconnect-1.2.tar.gz]
 md5=c255ff48387ea6a7092707ba992237e7
 sha256=47d6cc44f78fc6d4cdb1dfee02fe6e0f4d8aae0ce2e3e92567667f0475736617
@@ -26658,6 +26690,14 @@ sha256=4f923e24d674ac62ded3da402a4de6d402886d80e3d7cac91cf026921f32fcf7
 md5=b69ee5a5ffc825ff6d7970a62dcae46a
 sha256=6641a438972acdc8113957c25a17db55d6d9c3ce037ed3ac5337ac6ee153d73f
 
+[http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-10-08-rev2.zip]
+md5=2283368c079076b3e2d53cff854ca047
+sha256=505a77bda0011a1968a5a5c764cdbe81c536b1c8863f4dd31545735f5056497e
+
+[http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-10-08.zip]
+md5=850aabefe44682167cad5e57b6145ac3
+sha256=0e8cb79d14e2e3c82f311c052ea2e22cc380f9a97af1d259d25e2605e3237885
+
 [ftp://ftp.elmeg.de/artem/ClientCards/11b/linux/wl_lkm_718_release.tar.gz]
 md5=049c6c3d410e9f46884627b57485d3e7
 sha256=a28c7ea94d57a5354b7de06cf5f6416d80a40596911c129d4b6a4087dc916831
@@ -27542,6 +27582,10 @@ sha256=63606119e86c27b47bd7ec4b2b6048b76515df6755fc5dd8bcfc98f5fe53d994
 md5=e926692d74ee81ed459d0fe89439ff8b
 sha256=433fd29043cd427ba486bcce471aae3ad1abca94c8682feff92da0c380b8dff3
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.2.6.tar.bz2]
+md5=bc4b2356e1dbf2d21e1e95249b18f5f8
+sha256=dbf3799e207175e91f50492d51343e5cfdc706f637f6e9f14257b764e86bb3f9
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.3.0.tar.bz2]
 md5=21dac6461379d67ee3b333c77f63e7bf
 sha256=6d57420cce9201a14f2fb5c5f6bc8999ffdcc9520020d54290eb22db27c366c8
@@ -30154,6 +30198,10 @@ sha256=a3cfc867672924f27d5ed39a99bc089cc9417d193513984f0a081a92230e947b
 md5=9bcab80b474d5454477d1ca166a68c34
 sha256=27b9dc2203de9b1706ca39fa6ca80ecab8807909ec901c4a345b8e41178800a1
 
+[https://launchpad.net/ubuntu/karmic/+source/xubuntu-artwork/0.38/+files/xubuntu-artwork_0.38.tar.gz]
+md5=38626b5ae9abfe00428a5f0a265d5177
+sha256=8a73aea3fcb2b33968bc12f28befbf7a83c5d45fe1898e54855f095538238b8d
+
 [http://downloads.sourceforge.net/xvidcap/xvidcap-1.1.6.tar.gz]
 md5=c6add7ae452e5cecbdda6e55e7c67cdb
 sha256=17ca7b7f8ce12f7e312b2abc2da7f381dc0e964cdac6312631cd7987f02b9fba
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 715416798d..2bbd1dc5ce 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -113,6 +113,7 @@ SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3"
 SRCREV_pn-maemo-mapper ?= "118"
 SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04"
 SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9"
+SRCREV_pn-matchbox-config-gtk ?= "1614"
 SRCREV_pn-matchbox-desktop-2 ?= "2096"
 SRCREV_pn-matchbox-keyboard ?= "1910"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf
index b06cb319ca..8729715513 100644
--- a/conf/machine/omap3-pandora.conf
+++ b/conf/machine/omap3-pandora.conf
@@ -1,33 +1,75 @@
 #@TYPE: Machine
 #@NAME: OMAP3 based Pandora Handheld Console
 #@DESCRIPTION: Machine configuration for the Pandora http://www.openpandora.org/ Handheld Console
+#@MAINTAINER: John Willis
 
 TARGET_ARCH = "arm"
-require conf/machine/include/omap3.inc
+
+MACHINE_EXTRA_RRECOMMENDS = "omap3-sgx-modules "
 
 PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER = "xserver-xorg \
-           xf86-input-evdev \
-           xf86-input-tslib \
-           xf86-video-omapfb \
-          "
 
-#What is the correct one, both seem in use?
-MACHINE_GUI_CLASS = "bigscreen"
-GUI_MACHINE_CLASS = "bigscreen"
+XSERVER = " \
+	xserver-xorg \
+	xserver-xorg-extension-glx \
+	xserver-xorg-extension-dri \
+	xf86-input-evtouch \	
+	xf86-input-evdev \
+	xf86-input-mouse \
+	xf86-input-keyboard \
+	xf86-video-omapfb \
+"
 
 #800 * 480 Widescreen
+GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "800"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 
-# Ship all kernel modules
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules"
-
-IMAGE_FSTYPES += "jffs2 tar.bz2"
-EXTRA_IMAGECMD_jffs2 = "-lnp "
+#IMAGE_FSTYPES += "tar.bz2 ubi"
+IMAGE_FSTYPES = "tar.bz2"
+#EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen bluetooth wifi"
+require conf/machine/include/omap3.inc
+
+# Put it below omap3.inc as we override the kernel here
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+
+# Use our 'Powered by Angstrom' splash for the images.
+PREFERRED_PROVIDER_virtual/psplash = "psplash-omap3pandora"
+
+KERNEL_IMAGETYPE = "uImage"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_ARCH = "arm"
+UBOOT_MACHINE = "omap3_pandora_config"
+
+PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora"
+PREFERRED_PROVIDER_x-load = "x-load-omap3pandora"
+
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "x-load"
+
+PREFERRED_VERSION_libgles-omap3 = "3.00.00.09"
+
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"