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

5 files changed, 17 insertions, 1 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index a962f796de..dd18af3b0b 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -6998,6 +6998,10 @@ sha256=f3ecdb9d108bd61ec9394df75f5fd68ba886a8da0863ba6258338893aec6c04f
 md5=0f6e7ecca08e6e108dc06337f5b5cabf
 sha256=f3ecdb9d108bd61ec9394df75f5fd68ba886a8da0863ba6258338893aec6c04f
 
+[http://fribidi.org/download/fribidi-0.19.2.tar.gz]
+md5=626db17d2d99b43615ad9d12500f568a
+sha256=49cf91586e48b52fe25872ff66c1da0dff0daac2593f9f300e2af12f44f64177
+
 [http://www.tads.org/frobtads/frobtads-0.8.tar.gz]
 md5=c31b44a7bea51f04958358e575bde731
 sha256=1aa4fe2f4a8d79f7f4542d96f0b179886c04cbdfd6a972a19ab80437e6150549
@@ -15438,6 +15442,10 @@ sha256=97d0ac5957745eeaf311ec38ebbbf3b30a5316b01c320a759af47129c994c20c
 md5=949c33a81e83f7718a47280bef21b90c
 sha256=197bd2b57c5e2b9bfc30bb565a4c44fbea82daa20a31fa8ba490dd61dad69f2a
 
+[http://twibble.org/dist/sh4/src/lilosh/lilo-21.tar.gz]
+md5=1e975d827ad96e1942df73f63512178e
+sha256=da2340aca2eaf451243d2e4c2bf66aa4b80cc0abaef96860da8daf5db1cae12f
+
 [http://www-users.cs.york.ac.uk/~aw/pylinda/dist/linda-0.6.tar.gz]
 md5=c3e1b6c428218968e2963182c1df1fdc
 sha256=cba8ac22d77bbf8f6ed4a98933242b89ee2426cbc216f54415eafcac1274547a
@@ -28446,6 +28454,10 @@ sha256=0937b15ca5dcd6f49adff04096610cee1f70197e17d461aefa98ed52e5ea0b72
 md5=48958b1a3fc86261a26eea40a4f7d4af
 sha256=f539e6db53233fa75d5fa389b4807d54add312fc96de71b5eb7cf4f071719027
 
+[http://www.zsh.org/pub/zsh-4.3.10.tar.bz2]
+md5=74c5b275544400082a1cde806c98682a
+sha256=63fdc0273eadbb42d164f38b0b79922c0b3df0e97084e746a318276d935a4f7c
+
 [http://www.lachner-net.de/Frames/Software/zshopi_0.2.tar.bz2]
 md5=1343c4de6d586a1b4ed2b5c97d53e717
 sha256=6a136cbc7fdb38c73fe5862f21913e8fe63864063bba833c149c1098d758a12f
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index d5e09af068..8ae78b7148 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -91,6 +91,8 @@ PREFERRED_PROVIDER_avahi = "avahi"
 PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
 PREFERRED_PROVIDER_virtual/gail    ?= "gtk+"
 
+PREFERRED_PROVIDER_libfribidi = "fribidi"
+
 #powerpc needs additional patches to gcc
 ANGSTROM_GCC_VERSION_ppc405 		?= "4.1.1"
 ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index b81f0b17e1..7cc923cc60 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -635,7 +635,7 @@ PREFERRED_VERSION_gtkmm ?= "2.10.10"
 PREFERRED_VERSION_gtk-sato-engine ?= "0.1"
 PREFERRED_VERSION_gtk-sharp ?= "2.10.2"
 PREFERRED_VERSION_gtk-smooth-engine ?= "0.5.8"
-PREFERRED_VERSION_gtksourceview ?= "1.7.2"
+PREFERRED_VERSION_gtksourceview1 ?= "1.7.2"
 PREFERRED_VERSION_gtkterm2 ?= "0.2.3"
 PREFERRED_VERSION_gtk-xfce-engine ?= "2.4.1"
 PREFERRED_VERSION_gtracer ?= "0.0.10"
diff --git a/conf/machine/include/tune-sh3.inc b/conf/machine/include/tune-sh3.inc
index 65bfacf174..32801a61c3 100644
--- a/conf/machine/include/tune-sh3.inc
+++ b/conf/machine/include/tune-sh3.inc
@@ -1,2 +1,3 @@
 TARGET_CC_ARCH = "-ml -m3"
 FEED_ARCH = "sh3"
+BASE_PACKAGE_ARCH = "sh3"
diff --git a/conf/machine/include/tune-sh4.inc b/conf/machine/include/tune-sh4.inc
index c20b8cf5a0..5d43e4195e 100644
--- a/conf/machine/include/tune-sh4.inc
+++ b/conf/machine/include/tune-sh4.inc
@@ -1,2 +1,3 @@
 TARGET_CC_ARCH = "-ml -m4"
 FEED_ARCH = "sh4"
+BASE_PACKAGE_ARCH = "sh4"