merge of '2bc71b9b93f22417784c3a4ed3576a76841878f2'

     and 'edac95232b05ccd8efaeee530e0442683d1ef50a'

9 files changed, 24 insertions, 13 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 8ad4f9b537..92b8619ae1 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -8690,6 +8690,10 @@ sha256=b839b024fd717a404711f5ec14ee9b9e412a080f23e90841cde14f20970dc5dd
 md5=ddd9790c86b7ccc68f60761704cbcf81
 sha256=56e844da580761ddbb580683fc455a8d9eb3179df631568c26b7188d1ff16363
 
+[http://downloads.sourceforge.net/openttd/openttd-0.6.0-source.tar.gz]
+md5=dcf63687c73ff56887049fedaf6c6019
+sha256=39955ae5355299ac99f97093d01e66403516275dcac0f575bf1f3d0c67c17999
+
 [http://downloads.sourceforge.net/openvpn/openvpn-1.5.0.tar.gz]
 md5=55d7ce958bb2ccf3d3204d1350c27179
 sha256=d34d0a1a29de12cbb4fc6f8d80eced7b674ee3574e3df3d678fb0467283f7826
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index f606395f09..f02e045dbf 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -12,10 +12,10 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm'
 # perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616
 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"
 
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -Os"
 FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
-FULL_OPTIMIZATION_pn-glibc-intermediate = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
-FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+FULL_OPTIMIZATION_pn-glibc-intermediate = "-O2"
+FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
 FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 
 
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 47da0160a1..df0a21a3e4 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -120,6 +120,7 @@ SRCDATE_dvbtraffic ?= "20060814"
 SRCDATE_dvbtune ?= "20060814"
 SRCDATE_fdclock ?= "20060814"
 SRCDATE_fltk ?= "20060814"
+SRCDATE_gnuplot ?= "20080328"
 SRCDATE_ipatience ?= "20061112" 
 SRCDATE_ipkg-link ?= "20050930"
 SRCDATE_ipkg-link-1 ?= "20050930"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index f951d51f05..65e7b32d77 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -62,8 +62,8 @@ SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
 SRCREV_pn-matchbox-desktop-2 ?= "1778"
-SRCREV_pn-matchbox-keyboard ?= "1739"
-SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
+SRCREV_pn-matchbox-keyboard ?= "1910"
+SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-moko-gtk-engine ?= "3612"
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 76c27b153e..ee074f641c 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -2,14 +2,17 @@
 #@NAME: Beagleboard machine
 #@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7-a"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a"
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap"
-XSERVER = "xserver-kdrive-xomap"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
 
 # Only has DVI connector for external screen
 GUI_MACHINE_CLASS = "bigscreen"
 
+#Ship all kernel modules till the board support has matured enough
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+
 TARGET_FPU = "hard"
 include conf/machine/include/tune-arm1136jf-s.inc
 # requires gcc 4.3.0:
diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc
index 2da31ecd35..03e2e86a5f 100644
--- a/conf/machine/include/tune-cortexa8.inc
+++ b/conf/machine/include/tune-cortexa8.inc
@@ -1,4 +1,3 @@
-# valid options for -march: `armv7', `armv7-a'
-TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp"
-FEED_ARCH = "armv7"
-PACKAGE_ARCH = "armv7"
+TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp"
+FEED_ARCH = "armv7a"
+PACKAGE_ARCH = "armv7a"
diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc
index 448b28c91f..0a773149ff 100644
--- a/conf/machine/include/tune-strongarm.inc
+++ b/conf/machine/include/tune-strongarm.inc
@@ -2,5 +2,6 @@
 # gcc does not differentiate between the different Strongarm versions, so neither do we
 # http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-January/004031.html
 
+ARM_ABI = "oabi"
 TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm"
 
diff --git a/conf/machine/include/tune-x86.inc b/conf/machine/include/tune-x86.inc
new file mode 100644
index 0000000000..a536bbb6e5
--- /dev/null
+++ b/conf/machine/include/tune-x86.inc
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=i486"
+
+
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index 0ee69c2869..cce5868313 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -22,4 +22,4 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-#require conf/machine/include/tune-x86.inc
+require conf/machine/include/tune-x86.inc