merge of '65bea2472f8d53c3d2f8f8e784ede9b9a84f0af8'

     and 'cc0f788a513b8c6fcf2e55f8c9e0fb35c6f5c016'

7 files changed, 39 insertions, 17 deletions

diff --git a/packages/hostap/hostap-conf_1.0.bb b/packages/hostap/hostap-conf_1.0.bb
index dc40be49d7..e0909dde3f 100644
--- a/packages/hostap/hostap-conf_1.0.bb
+++ b/packages/hostap/hostap-conf_1.0.bb
@@ -2,8 +2,9 @@ DESCRIPTION = "PCMCIA-cs configuration files for wireless LAN cards based on Int
 SECTION = "kernel/modules"
 PRIORITY = "optional"
 LICENSE = "GPL"
+RDEPENDS = "update-modules"
 PACKAGE_ARCH = "all"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "file://hostap_cs.conf \
            file://hostap_cs.modalias \
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index b00ae95253..bb2ad455fd 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -4,20 +4,9 @@ LICENSE = "GPL"
 
 inherit kernel
 
-# These devices need mkimage to generate a kernel image 
-DEPENDS_append_kb9202         = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_at32stk1000    = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_atngw100       = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_at91sam9263ek  = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_at91sam9261ek  = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_at91sam9260ek  = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_sarge-at91     = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_gumstix-connex = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_gumstix-verdex = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_fic-gta01      = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_fic-gta02      = " u-boot-mkimage-openmoko-native "
-DEPENDS_append_mpc8313e-rdb   = " u-boot "
-DEPENDS_append_mpc8323e-rdb   = " u-boot "
+# Not every device needs mkimage to generate a kernel image, but lets make OE a bit more
+# friendly and increase the "Just Works(TM) factor. Building uboot takes only a minute.
+DEPENDS += " u-boot-mkimage-openmoko-native "
 
 
 RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
@@ -46,7 +35,7 @@ do_configure_prepend() {
         #
         if [ "${TARGET_OS}" = "linux-gnueabi" -o  "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
                 echo "CONFIG_AEABI=y"                   >> ${S}/.config
-                echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
+                echo "# CONFIG_OABI_COMPAT is not set"             >> ${S}/.config
         else
                 echo "# CONFIG_AEABI is not set"        >> ${S}/.config
                 echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
diff --git a/packages/orinoco/orinoco-conf_1.0.bb b/packages/orinoco/orinoco-conf_1.0.bb
index 97b860f2cf..0062e870a6 100644
--- a/packages/orinoco/orinoco-conf_1.0.bb
+++ b/packages/orinoco/orinoco-conf_1.0.bb
@@ -2,8 +2,9 @@ DESCRIPTION = "PCMCIA-cs configuration files for Hermes (Orinoco) wireless LAN c
 SECTION = "kernel/modules"
 PRIORITY = "optional"
 LICENSE = "GPL"
+RDEPENDS = "update-modules"
 PACKAGE_ARCH = "all"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "file://spectrum.conf \
            file://hermes.conf \
diff --git a/packages/tea/.mtn2git_empty b/packages/tea/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tea/.mtn2git_empty
diff --git a/packages/tea/tea/.mtn2git_empty b/packages/tea/tea/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tea/tea/.mtn2git_empty
diff --git a/packages/tea/tea/move-endif.patch b/packages/tea/tea/move-endif.patch
new file mode 100644
index 0000000000..0fabee887c
--- /dev/null
+++ b/packages/tea/tea/move-endif.patch
@@ -0,0 +1,20 @@
+--- src/callbacks.c~	2007-10-23 18:43:04.000000000 +0200
++++ src/callbacks.c	2007-10-23 18:43:04.000000000 +0200
+@@ -5609,8 +5609,6 @@
+ 
+ #if defined (HAVE_LIBASPELL) || defined (ENCHANT_SUPPORTED)
+   GList *l = get_suggestions_list (p->prefix);
+-#endif
+-
+   if (l)
+      {
+       build_menu_wudata_from_glist (l, mni_suggestions, on_mni_suggestion_select, temp_text_part);
+@@ -5620,6 +5618,8 @@
+      }
+ 
+   glist_strings_free (l);
++#endif
++
+ }
+ 
+ 
diff --git a/packages/tea/tea_17.3.5.bb b/packages/tea/tea_17.3.5.bb
new file mode 100644
index 0000000000..7adf2a5136
--- /dev/null
+++ b/packages/tea/tea_17.3.5.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Tea - a GTK based text editor tith highlighting and a lot of processing features"
+SECTION = "gpe"
+LICENSE = "GPL"
+DEPENDS = "gtk+ gtksourceview"
+
+inherit autotools
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/tea-editor/${P}.tar.bz2 \
+           file://move-endif.patch;patch=1;pnum=0"
+
+EXTRA_OECONF = "--enable-legacy"