merge of '1ba4060144f3549b5ec4424715ddde5fd9d0ad61'

     and 'a66740dc82701e8bcaf09d803b69b8601b7efb2d'

7 files changed, 42 insertions, 12 deletions

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 382d562426..8517c5bc8e 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,9 +1,11 @@
 PREFERRED_VERSION_busybox 	= "1.9.2"
+PREFERRED_VERSION_cairo		= "1.6.4"
 PREFERRED_VERSION_dbus 		= "1.2.1"
 PREFERRED_VERSION_glib-2.0 	= "2.16.1"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
 PREFERRED_VERSION_libtool 	= "1.5.10"
 PREFERRED_VERSION_pango 	= "1.18.3"
+PREFERRED_VERSION_pixman	= "0.10.0"
 PREFERRED_VERSION_pulseaudio 	= "0.9.9"
 PREFERRED_VERSION_udev 		= "118"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 394ec7c2d4..07873fe700 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -14,6 +14,8 @@ PREFERRED_PROVIDER_virtual/sparc${TARGET_VENDOR}-linux-libc-for-gcc          = "
 
 TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 
+#TARGET_OS = "linux-gnuspe"
+
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
 # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index bd56a09de6..bbdbe7f80b 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -281,9 +281,10 @@ TINDER_CLOBBER    = "1"
 TINDER_REPORT     = "1"
 
 # Configuration for seppuku autobuilder, people only need to put:
-# INHERIT += "seppuku"
+# INHERIT += "seppuku oestats-client"
 # SEPPUKU_USER         = "your_bugzilla@user.id"
 # SEPPUKU_PASS         = "your_bugzilla_password"
+# OESTATS_BUILDER      = "your_name" 
 # in their local.conf
 
 # seppuku bbclass
@@ -297,7 +298,7 @@ SEPPUKU_AUTOBUILD    = "1"
 SEPPUKU_PRODUCT      = "Openembedded"
 SEPPUKU_COMPONENT    = "org.openembedded.dev"
 
-
+OESTATS_SERVER      ?= "tinderbox.openembedded.net"
 
 
 
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index df53515a9a..65a4543437 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -4,6 +4,7 @@ SRCREV_pn-mickeyterm = "${AUTOREV}"
 SRCREV_pn-pyneod = "${AUTOREV}"
 SRCREV_pn-pynoeg = "${AUTOREV}"
 SRCREV_pn-python-odeviced = "${AUTOREV}"
+SRCREV_pn-python-oeventd = "${AUTOREV}"
 SRCREV_pn-python-ophoned = "${AUTOREV}"
 SRCREV_pn-python-ousaged = "${AUTOREV}"
 SRCREV_pn-python-pytrc = "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 293340c478..8b91857a78 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -14,8 +14,8 @@
 SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-assassin ?= "93"
 SRCREV_pn-bfin-uclibc ?= "1857"
-SRCREV_pn-uclibc ?= "21926"
-SRCREV_pn-uclibc-initial ?= "21926"
+SRCREV_pn-uclibc ?= "21996"
+SRCREV_pn-uclibc-initial ?= "21996"
 SRCREV_pn-contact ?= "1410"
 SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dbus-c++ ?= "13131"
@@ -24,9 +24,9 @@ SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-diversity-daemon ?= "277"
 SRCREV_pn-diversity-nav ?= "340"
 SRCREV_pn-eds-dbus ?= "659"
-SRCREV_pn-eglibc ?= "5963"
-SRCREV_pn-eglibc-initial ?= "5963"
-SRCREV_pn-eglibc-intermediate ?= "5963"
+SRCREV_pn-eglibc ?= "6229"
+SRCREV_pn-eglibc-initial ?= "6229"
+SRCREV_pn-eglibc-intermediate ?= "6229"
 SRCREV_pn-enlazar ?= "37"
 SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
@@ -152,14 +152,15 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4247"
-SRCREV_pn-opkg-native ?= "4247"
-SRCREV_pn-opkg-sdk ?= "4247"
+SRCREV_pn-opkg ?= "4452"
+SRCREV_pn-opkg-native ?= "4452"
+SRCREV_pn-opkg-sdk ?= "4452"
 SRCREV_pn-oprofileui ?= "160"
-SRCREV_pn-packagekit ?= "74a3b7e3f3bc8627c23349e0b0d8429fd5f53fc6"
+SRCREV_pn-packagekit ?= "ebbbfa191257861bd19bd47ba646dce590b51858"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "4214"
 SRCREV_pn-python-odeviced ?= "2f02576532b52732251b3c530a09e4c08685a911"
+SRCREV_pn-python-oeventd ?= "d9646ee640fe6eabd023b82a7a0b8ed529cf07b7"
 SRCREV_pn-python-ophoned ?= "8bb89a912163c8a846be7a14b2a6e2f832f91bd6"
 SRCREV_pn-python-ousaged ?= "c7f83c3f696b6e72f3cab244af4e88dc4851018e"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 824ab2b7b3..6842897dd1 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -18,7 +18,7 @@ include conf/machine/include/tune-arm1136jf-s.inc
 #include conf/machine/include/tune-cortexa8.inc
 
 
-IMAGE_FSTYPES ?= "tar.bz2"
+IMAGE_FSTYPES += "tar.bz2 jffs2"
 
 # Guesswork
 SERIAL_CONSOLE = "115200 ttyS2"
diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf
new file mode 100644
index 0000000000..e66109a785
--- /dev/null
+++ b/conf/machine/neuros-osd2.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: neuros OSD2
+#@DESCRIPTION: neuros OSD2
+
+TARGET_ARCH = "arm"
+
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
+
+PREFERRED_VERSION_u-boot = "git"
+#UBOOT_MACHINE = "davinci_dvevm_config"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+ROOT_FLASH_SIZE = "29"
+
+MACHINE_FEATURES = "kernel26 pcmcia usbhost screen"
+
+require conf/machine/include/tune-arm926ejs.inc
+