merge of 'b5c2080b62dd6480fdd3b3687e291ee915379afd'

and 'c49f478890b0d92c1c59e4c0cf0d74b6990e6745'
author: OpenEmbedded Project <openembedded-devel@lists.openembedded.org> 2008-03-22 11:12:50 +0000
committer: OpenEmbedded Project <openembedded-devel@lists.openembedded.org> 2008-03-22 11:12:50 +0000
commit: 8e73e9517a7d9e4c5273cf8c3bf4420ab6adb3e2 (patch)
tree: 4f2ccf85f1d7497c5cb3d2ce456db8151d5bdd79
parent: b6ae8ef31690d3a1a829eaa734828075eacc1fd4 (diff)
parent: 471667fb417dcf2fa437393690764c187ca29b7e (diff)
77 files changed, 1899 insertions, 493 deletions
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
new file mode 100644
index 0000000000..eee28ddc75
--- /dev/null
+++ b/classes/efl.bbclass
@@ -0,0 +1,40 @@
+SECTION = "e/libs"
+HOMEPAGE = "http://www.enlightenment.org"
+LICENSE = "MIT BSD"
+SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
+SRC_URI = "${E_CVS};module=e17/libs/${SRCNAME}"
+S = "${WORKDIR}/${SRCNAME}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-tests"
+
+FILES_${PN} = "${libdir}/*.so.*"
+
+FILES_${PN}-themes = "${datadir}/${PN}/themes \
+                      ${datadir}/${PN}/data \
+                      ${datadir}/${PN}/fonts \
+                      ${datadir}/${PN}/pointers \
+                      ${datadir}/${PN}/images \
+                      ${datadir}/${PN}/users \
+                      ${datadir}/${PN}/images \
+                      ${datadir}/${PN}/styles"
+
+FILES_${PN}-dev   += "${bindir}/${PN}-config \
+                      ${libdir}/pkgconfig/* \
+                      ${libdir}/lib*.la \
+                      ${libdir}/lib*.a \
+                      ${libdir}/*.so \
+                      ${libdir}/${PN}/*.a \
+                      ${libdir}/${PN}/*.la \
+                      ${libdir}/${PN}/*/*.a \
+                      ${libdir}/${PN}/*/*.la"
+
+FILES_${PN}-tests  = "${bindir}/${PN} \
+                      ${bindir}/*_* \
+                      ${datadir}"
+
diff --git a/classes/efl_base.bbclass b/classes/efl_base.bbclass
deleted file mode 100644
index 023b2edf74..0000000000
--- a/classes/efl_base.bbclass
+++ /dev/null
@@ -1,14 +0,0 @@
-inherit autotools pkgconfig
-
-SECTION = "e/libs"
-HOMEPAGE = "http://www.enlightenment.org"
-SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
-SRC_URI = "http://download.enlightenment.org/snapshots/2008-01-25/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-do_stage() {
-	autotools_stage_all
-}
-
-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev"
-FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig/* ${libdir}/lib*.?a ${libdir}/lib*.a"
diff --git a/classes/efl_library.bbclass b/classes/efl_library.bbclass
deleted file mode 100644
index c2b6938e47..0000000000
--- a/classes/efl_library.bbclass
+++ /dev/null
@@ -1,9 +0,0 @@
-inherit efl_base
-
-SRC_URI = "${E_CVS};module=e17/libs/${SRCNAME}"
-S = "${WORKDIR}/${SRCNAME}"
-
-PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${bindir}/${PN} ${bindir}/*_* ${datadir}"
-FILES_${PN}-dev += "${bindir}/*-config ${libdir}/${PN}/*.a ${libdir}/${PN}/*.la ${libdir}/${PN}/*/*.a ${libdir}/${PN}/*/*.la"
-FILES_${PN} = "${libdir}/*.so*"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index deac4e9225..13498ac7bc 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE = "20080311"
+EFL_SRCDATE = "20080321"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
@@ -81,6 +81,7 @@ SRCDATE_engrave ?= "${EFL_SRCDATE}"
 SRCDATE_evolve-native ?= "${EFL_SRCDATE}"
 SRCDATE_evolve ?= "${EFL_SRCDATE}"
 SRCDATE_gevas2 ?= "${EFL_SRCDATE}"
+SRCDATE_imlib2 ?= "${EFL_SRCDATE}"
 
 # Enlightenment Bindings
 SRCDATE_eflpp ?= "${EFL_SRCDATE}"
diff --git a/conf/machine/ts72xx.conf b/conf/machine/ts72xx.conf
index 632f3044cc..960deb7337 100644
--- a/conf/machine/ts72xx.conf
+++ b/conf/machine/ts72xx.conf
@@ -7,13 +7,10 @@ PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 
-MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen"
-
-# default is 2.6.22.6
-#PREFERRED_VERSION_linux = "2.6.23-rc5"
+MACHINE_FEATURES = "kernel26 ext2 usbhost bluetooth"
 
 SERIAL_CONSOLE = "115200 ttyAM0"
 USE_VT = "0"
-CMDLINE = "console=ttyAM0,115200 ip=192.168.1.3:192.168.1.2:192.168.1.2:255.255.255.0 root=/dev/nfs nfsroot=192.168.1.2:/media/data/devel/om2007.2/ts72xx/tmp/deploy/glibc/images/ts72xx/nfs_root"
+CMDLINE = "console=ttyAM0,115200 ip=192.168.1.3:192.168.1.2:192.168.1.2:255.255.255.0 root=/dev/nfs nfsroot=192.168.1.2:/media/data/devel/oe/ts72xx-stable/tmp/deploy/glibc/images/ts72xx/nfsroot"
 
 require conf/machine/include/tune-arm920t.inc
diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py
index 94ae5ce4fd..69788f66af 100755
--- a/contrib/python/generate-manifest-2.5.py
+++ b/contrib/python/generate-manifest-2.5.py
@@ -294,8 +294,11 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-subprocess", "Python Subprocess Support", "python-core python-io python-re python-fcntl python-pickle",
     "subprocess.*" )
 
-    m.addPackage( 1, "python-sqlite3", "Python Sqlite3 Database Support", "python-core",
-    "lib-dynload/_sqlite3.so sqlite3" ) # package
+    m.addPackage( 2, "python-sqlite3", "Python Sqlite3 Database Support", "python-core python-datetime python-lang python-crypt python-io python-threading python-zlib",
+    "lib-dynload/_sqlite3.so sqlite3/dbapi2.* sqlite3/__init__.*" )
+
+    m.addPackage( 0, "python-sqlite3-tests", "Python Sqlite3 Database Support Tests", "python-core python-sqlite3",
+    "sqlite3/test" )
 
     m.addPackage( 0, "python-stringold", "Python String APIs [deprecated]", "python-core python-re",
     "lib-dynload/strop.so string.*" )
diff --git a/packages/e17/e-wm/disable-e-cursor.patch b/packages/e17/e-wm/disable-e-cursor.patch
new file mode 100644
index 0000000000..51618434a5
--- /dev/null
+++ b/packages/e17/e-wm/disable-e-cursor.patch
@@ -0,0 +1,277 @@
+Index: e/src/bin/e_config.c
+===================================================================
+--- e.orig/src/bin/e_config.c
++++ e/src/bin/e_config.c
+@@ -461,6 +461,7 @@ e_config_init(void)
+    E_CONFIG_VAL(D, T, focus_last_focused_per_desktop, INT); /**/
+    E_CONFIG_VAL(D, T, focus_revert_on_hide_or_close, INT); /**/
+    E_CONFIG_VAL(D, T, pointer_slide, INT); /**/
++   E_CONFIG_VAL(D, T, show_cursor, INT); /**/
+    E_CONFIG_VAL(D, T, use_e_cursor, INT); /**/
+    E_CONFIG_VAL(D, T, cursor_size, INT); /**/
+    E_CONFIG_VAL(D, T, menu_autoscroll_margin, INT); /**/
+@@ -705,6 +706,7 @@ e_config_init(void)
+    e_config->focus_last_focused_per_desktop = 1;
+    e_config->focus_revert_on_hide_or_close = 1;
+    e_config->pointer_slide = 1;
++   e_config->show_cursor = 1;
+    e_config->use_e_cursor = 1;
+    e_config->cursor_size = 32;
+    e_config->menu_autoscroll_margin = 0;
+@@ -1570,6 +1572,7 @@ e_config_init(void)
+    E_CONFIG_LIMIT(e_config->focus_last_focused_per_desktop, 0, 1);
+    E_CONFIG_LIMIT(e_config->focus_revert_on_hide_or_close, 0, 1);
+    E_CONFIG_LIMIT(e_config->pointer_slide, 0, 1);
++   E_CONFIG_LIMIT(e_config->show_cursor, 0, 1);
+    E_CONFIG_LIMIT(e_config->use_e_cursor, 0, 1);
+    E_CONFIG_LIMIT(e_config->cursor_size, 0, 1024);
+    E_CONFIG_LIMIT(e_config->menu_autoscroll_margin, 0, 50);
+Index: e/src/modules/conf_mouse_cursor/e_int_config_cursor.c
+===================================================================
+--- e.orig/src/modules/conf_mouse_cursor/e_int_config_cursor.c
++++ e/src/modules/conf_mouse_cursor/e_int_config_cursor.c
+@@ -3,16 +3,25 @@
+ static void        *_create_data(E_Config_Dialog *cfd);
+ static void        _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+ static int         _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
++static void        _basic_show_cursor_cb_change(void *data, Evas_Object *obj);
+ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+ static int         _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
++static void        _advanced_show_cursor_cb_change(void *data, Evas_Object *obj);
+ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+ 
+ struct _E_Config_Dialog_Data 
+ {
++   int show_cursor;
+    int use_e_cursor;
+ 
+    /* Advanced */
+    int cursor_size;
++
++   struct
++     {
++         Evas_Object *radio_use_e_cursor;
++         Evas_Object *slider_cursor_size;
++     } gui;
+ };
+ 
+ EAPI E_Config_Dialog *
+@@ -41,6 +50,7 @@ e_int_config_cursor(E_Container *con, co
+ static void
+ _fill_data(E_Config_Dialog_Data *cfdata) 
+ {
++   cfdata->show_cursor = e_config->show_cursor;
+    cfdata->use_e_cursor = e_config->use_e_cursor;
+    cfdata->cursor_size = e_config->cursor_size;
+ }
+@@ -66,9 +76,11 @@ _basic_apply_data(E_Config_Dialog *cfd, 
+ {
+    int changed = 0;
+    
++   if (e_config->show_cursor != cfdata->show_cursor) changed = 1;
+    if (e_config->use_e_cursor != cfdata->use_e_cursor) changed = 1;
+    
+    e_config->use_e_cursor = cfdata->use_e_cursor;
++   e_config->show_cursor = cfdata->show_cursor;
+    e_config_save_queue();
+    
+    if (changed) 
+@@ -79,6 +91,11 @@ _basic_apply_data(E_Config_Dialog *cfd, 
+ 	  {
+ 	     E_Manager *man;
+ 	     man = l->data;
++         if (man->pointer && !e_config->show_cursor)
++           {
++               e_pointer_hide(man->pointer);
++               continue;
++           }
+ 	     if (man->pointer) e_object_del(E_OBJECT(man->pointer));
+ 	     man->pointer = e_pointer_window_new(man->root, 1);
+ 	  }
+@@ -86,6 +103,17 @@ _basic_apply_data(E_Config_Dialog *cfd, 
+    return 1;
+ }
+ 
++static void
++_basic_show_cursor_cb_change(void *data, Evas_Object *obj)
++{
++   E_Config_Dialog_Data *cfdata;
++
++   cfdata = data;
++   if (!cfdata) return;
++
++   e_widget_disabled_set(cfdata->gui.radio_use_e_cursor, !cfdata->show_cursor);
++}
++
+ static Evas_Object *
+ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+ {
+@@ -94,8 +122,14 @@ _basic_create_widgets(E_Config_Dialog *c
+    
+    o = e_widget_list_add(evas, 0, 0);
+       
++   ob = e_widget_check_add(evas, _("Show Cursor"), &(cfdata->show_cursor));
++   e_widget_on_change_hook_set(ob, _basic_show_cursor_cb_change, cfdata);
++   e_widget_list_object_append(o, ob, 1, 1, 0.5);
++
+    of = e_widget_framelist_add(evas, _("Cursor Settings"), 0);
+    rg = e_widget_radio_group_new(&cfdata->use_e_cursor);
++   cfdata->gui.radio_use_e_cursor = rg;
++
+    ob = e_widget_radio_add(evas, _("Use Enlightenment Cursor"), 1, rg);   
+    e_widget_framelist_object_append(of, ob);
+    ob = e_widget_radio_add(evas, _("Use X Cursor"), 0, rg);   
+@@ -111,9 +145,11 @@ _advanced_apply_data(E_Config_Dialog *cf
+ {
+    int changed = 0;
+    
++   if (e_config->show_cursor != cfdata->show_cursor) changed = 1;
+    if (e_config->use_e_cursor != cfdata->use_e_cursor) changed = 1;
+    if (e_config->cursor_size != cfdata->cursor_size) changed = 1;
+-   
++
++   e_config->show_cursor = cfdata->show_cursor;
+    e_config->use_e_cursor = cfdata->use_e_cursor;
+    if (cfdata->cursor_size <= 0) cfdata->cursor_size = 1;
+    e_config->cursor_size = cfdata->cursor_size;
+@@ -128,6 +164,11 @@ _advanced_apply_data(E_Config_Dialog *cf
+ 	  {
+ 	     E_Manager *man;
+ 	     man = l->data;
++         if (man->pointer && !e_config->show_cursor)
++           {
++               e_pointer_hide(man->pointer);
++               continue;
++           }
+ 	     if (man->pointer) e_object_del(E_OBJECT(man->pointer));
+ 	     man->pointer = e_pointer_window_new(man->root, 1);
+ 	  }	
+@@ -135,6 +176,18 @@ _advanced_apply_data(E_Config_Dialog *cf
+    return 1;
+ }
+ 
++static void
++_advanced_show_cursor_cb_change(void *data, Evas_Object *obj)
++{
++   E_Config_Dialog_Data *cfdata;
++
++   cfdata = data;
++   if (!cfdata) return;
++
++   e_widget_disabled_set(cfdata->gui.radio_use_e_cursor, !cfdata->show_cursor);
++   e_widget_disabled_set(cfdata->gui.slider_cursor_size, !cfdata->show_cursor);
++}
++
+ static Evas_Object *
+ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+ {
+@@ -143,16 +196,27 @@ _advanced_create_widgets(E_Config_Dialog
+       
+    o = e_widget_list_add(evas, 0, 0);
+ 
++   ob = e_widget_check_add(evas, _("Show Cursor"), &(cfdata->show_cursor));
++   e_widget_on_change_hook_set(ob, _advanced_show_cursor_cb_change, cfdata);
++   e_widget_list_object_append(o, ob, 1, 1, 0.5);
++
+    of = e_widget_framelist_add(evas, _("Cursor Settings"), 0);
+    rg = e_widget_radio_group_new(&cfdata->use_e_cursor);
++   cfdata->gui.radio_use_e_cursor = rg;
++
+    ob = e_widget_radio_add(evas, _("Use Enlightenment Cursor"), 1, rg);   
+    e_widget_framelist_object_append(of, ob);
+    ob = e_widget_radio_add(evas, _("Use X Cursor"), 0, rg);   
+    e_widget_framelist_object_append(of, ob);
+    ob = e_widget_label_add(evas, _("Cursor Size"));
+    e_widget_framelist_object_append(of, ob);
++
+    ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pixels"), 8, 128, 4, 0, NULL, &(cfdata->cursor_size), 150);
++   cfdata->gui.slider_cursor_size = ob;
++
+    e_widget_framelist_object_append(of, ob);
++
+    e_widget_list_object_append(o, of, 1, 1, 0.5);   
++
+    return o;
+ }
+Index: e/src/bin/e_pointer.c
+===================================================================
+--- e.orig/src/bin/e_pointer.c
++++ e/src/bin/e_pointer.c
+@@ -94,6 +94,8 @@ e_pointers_size_set(int size)
+ {
+    Evas_List *l;
+ 
++   if (!e_config->show_cursor) return;
++
+    for (l = _e_pointers; l; l = l->next)
+      {
+ 	E_Pointer *p;
+@@ -136,6 +138,13 @@ e_pointers_size_set(int size)
+ }
+ 
+ EAPI void
++e_pointer_hide(E_Pointer *p)
++{
++    if (p->win) ecore_x_window_cursor_set(p->win, 0);
++    if (p->evas) _e_pointer_canvas_del(p);
++}
++
++EAPI void
+ e_pointer_type_push(E_Pointer *p, void *obj, const char *type)
+ {
+    E_Pointer_Stack *stack;
+@@ -199,6 +208,7 @@ EAPI void
+ e_pointer_idler_before(void)
+ {
+    Evas_List *l;
++   if (!e_config->show_cursor) return;
+ 
+    for (l = _e_pointers; l; l = l->next)
+      {
+@@ -305,6 +315,8 @@ _e_pointer_cb_move(void *data, Evas *e _
+    E_Pointer *p;
+    Evas_Coord x, y;
+ 
++   if (!e_config->show_cursor) return;
++
+    p = data;
+    if (!p->e_cursor) return;
+    evas_object_geometry_get(p->hot_object, &x, &y, NULL, NULL);
+@@ -353,6 +365,13 @@ _e_pointer_type_set(E_Pointer *p, const 
+    if (p->type) evas_stringshare_del(p->type);
+    p->type = evas_stringshare_add(type);
+    
++   /* Do not set type if in "hidden mode" */
++   if (!e_config->show_cursor)
++     {
++	ecore_x_window_cursor_set(p->win, 0);
++	return 1;
++     }
++
+    if (p->e_cursor)
+      {
+ 	Evas_Object *o;
+Index: e/src/bin/e_config.h
+===================================================================
+--- e.orig/src/bin/e_config.h
++++ e/src/bin/e_config.h
+@@ -166,6 +166,7 @@ struct _E_Config
+    int         focus_last_focused_per_desktop; // GUI
+    int         focus_revert_on_hide_or_close; // GUI
+    int         pointer_slide; // GUI
++   int         show_cursor; // GUI
+    int         use_e_cursor; // GUI
+    int         cursor_size; // GUI
+    int         menu_autoscroll_margin; // GUI
+Index: e/src/bin/e_pointer.h
+===================================================================
+--- e.orig/src/bin/e_pointer.h
++++ e/src/bin/e_pointer.h
+@@ -42,6 +42,7 @@ struct _E_Pointer
+ EAPI int        e_pointer_init(void);
+ EAPI int        e_pointer_shutdown(void);    
+ EAPI E_Pointer *e_pointer_window_new(Ecore_X_Window win, int filled);
++EAPI void	e_pointer_hide(E_Pointer *p);
+ EAPI void       e_pointer_type_push(E_Pointer *p, void *obj, const char *type);
+ EAPI void       e_pointer_type_pop(E_Pointer *p, void *obj, const char *type);
+ EAPI void       e_pointers_size_set(int size);
diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb
index c3a243a675..364e5539e1 100644
--- a/packages/e17/e-wm_cvs.bb
+++ b/packages/e17/e-wm_cvs.bb
@@ -2,11 +2,12 @@ DESCRIPTION = "The Enlightenment Window Mananger Version 17"
 DEPENDS = "eet evas ecore edje efreet"
 LICENSE = "MIT BSD"
 PV = "0.16.999.042+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit e update-alternatives
 
 SRC_URI = "${E_CVS};module=e17/apps/e \
+           file://disable-e-cursor.patch;patch=1 \
            file://Xsession.d/98enlightenment \
            file://applications.menu \
 "
diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
index 6175c605c0..84c0b90c29 100644
--- a/packages/efl1/ecore.inc
+++ b/packages/efl1/ecore.inc
@@ -5,7 +5,7 @@ DEPENDS = "curl eet evas tslib"
 # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv"
 PV = "0.9.9.042+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
 SRC_URI += "file://fix-directfb-include.patch;patch=1"
 
diff --git a/packages/efl1/edb_cvs.bb b/packages/efl1/edb_cvs.bb
index 97dafb3931..8ad9c361a0 100644
--- a/packages/efl1/edb_cvs.bb
+++ b/packages/efl1/edb_cvs.bb
@@ -3,4 +3,4 @@ LICENSE = "MIT BSD"
 DEPENDS = "zlib"
 PV = "1.0.5.042+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb
index d9c2b83b79..0a4e04e558 100644
--- a/packages/efl1/edbus_cvs.bb
+++ b/packages/efl1/edbus_cvs.bb
@@ -1,16 +1,19 @@
 DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
-DEPENDS = "dbus ecore"
+DEPENDS = "dbus ecore efreet ewl"
 LICENSE = "MIT BSD"
 PV = "0.1.0.042+cvs${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
-inherit efl_library
+inherit efl
 
 SRC_URI = "${E_CVS};module=e17/libs/e_dbus"
 S = "${WORKDIR}/e_dbus"
 
-PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal"
+EXTRA_OECONF = "--enable-build-test-gui"
+
+PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal ${PN}-test-gui"
 FILES_${PN}-enotify = "${libdir}/libenotify.so.*"
 FILES_${PN}-edbus = "${libdir}/libedbus.so.*"
 FILES_${PN}-enm = "${libdir}/libenm.so.*"
 FILES_${PN}-ehal = "${libdir}/libehal.so.*"
+FILES_${PN}-test-gui = "${bindir}/e_dbus_hal"
diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb
index e930fc4795..d0a1848c93 100644
--- a/packages/efl1/edje_cvs.bb
+++ b/packages/efl1/edje_cvs.bb
@@ -2,9 +2,13 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
 DEPENDS = "eet evas ecore embryo edje-native"
 LICENSE = "MIT BSD"
 PV = "0.5.0.042+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
-inherit efl_library
+inherit efl
 
-PACKAGES =+ "${PN}-tools"
-FILES_${PN}-tools = "${bindir}/edje_*"
+PACKAGES =+ "${PN}-utils"
+DEBIAN_NOAUTONAME_${PN}-utils = "1"
+FILES_${PN}-utils = "\
+  ${bindir}/edje_* \
+  ${datadir}/edje/include/edje.inc \
+"
diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_cvs.bb
index 370b385bf8..c834cfa60a 100644
--- a/packages/efl1/eet_cvs.bb
+++ b/packages/efl1/eet_cvs.bb
@@ -4,4 +4,4 @@ LICENSE = "MIT BSD"
 PV = "0.9.10.042+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/eflpp_cvs.bb b/packages/efl1/eflpp_cvs.bb
index ce01d89112..19db2ef41e 100644
--- a/packages/efl1/eflpp_cvs.bb
+++ b/packages/efl1/eflpp_cvs.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 DEPENDS = "evas ecore edje emotion esmart etk ewl libsigc++-2.0"
 PV = "0.1.0+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_cvs.bb
index a1a027fc8f..3087391312 100644
--- a/packages/efl1/efreet_cvs.bb
+++ b/packages/efl1/efreet_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 PV = "0.0.3.042+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 PACKAGES =+ "${PN}-mime"
 FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*"
diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb
index 2f5ab176ce..6befb0c065 100644
--- a/packages/efl1/embryo_cvs.bb
+++ b/packages/efl1/embryo_cvs.bb
@@ -1,6 +1,9 @@
 DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
 LICENSE = "MIT BSD"
 PV = "0.9.1.042+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
-inherit efl_library
+inherit efl
+
+# HACK alert: When compiling for VFP embryo emits bugs -- maybe gcc bug
+#FULL_OPTIMIZATION_arm =+ "-O0"
diff --git a/packages/efl1/emotion_cvs.bb b/packages/efl1/emotion_cvs.bb
index 36a5065e7a..826f201779 100644
--- a/packages/efl1/emotion_cvs.bb
+++ b/packages/efl1/emotion_cvs.bb
@@ -2,14 +2,13 @@ DESCRIPTION = "The Enlightenment multimedia library"
 LICENSE = "MIT BSD"
 # we no longer build the libxine backend, since the gstreamer backend seems more promising
 DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
-RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
 PV = "0.1.0+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
-inherit efl_library
+inherit efl
 
 EXTRA_OECONF = "--disable-xine --enable-gstreamer"
 
-PACKAGES =+ "emotion-backend-gstreamer emotion-test"
+PACKAGES =+ "emotion-backend-gstreamer"
 FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so"
-FILES_emotion-test = "${bindir}/emotion_test ${datadir}"
+RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
diff --git a/packages/efl1/engrave_cvs.bb b/packages/efl1/engrave_cvs.bb
index 689e254fc1..ec39189410 100644
--- a/packages/efl1/engrave_cvs.bb
+++ b/packages/efl1/engrave_cvs.bb
@@ -4,4 +4,4 @@ LICENSE = "MIT"
 DEPENDS = "evas ecore"
 PV = "0.0.0+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/enhance_cvs.bb b/packages/efl1/enhance_cvs.bb
index 728beb61ec..8c73fbe1d8 100644
--- a/packages/efl1/enhance_cvs.bb
+++ b/packages/efl1/enhance_cvs.bb
@@ -3,4 +3,4 @@ LICENSE = "MIT"
 DEPENDS = "exml"
 PV = "0.0.0+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb
index fa4f4282e1..e48c36606e 100644
--- a/packages/efl1/epdf_cvs.bb
+++ b/packages/efl1/epdf_cvs.bb
@@ -4,7 +4,7 @@ DEPENDS = "poppler evas ecore etk ewl"
 PV = "0.1.0+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME} \
            file://fix-plugin-path-check.patch;HACK=1;patch=1"
diff --git a/packages/efl1/epeg_cvs.bb b/packages/efl1/epeg_cvs.bb
index 3991dd3d21..16d1c333a9 100644
--- a/packages/efl1/epeg_cvs.bb
+++ b/packages/efl1/epeg_cvs.bb
@@ -4,4 +4,4 @@ DEPENDS = "jpeg"
 PV = "0.9.0+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/epsilon/compile-fix.patch b/packages/efl1/epsilon/compile-fix.patch
deleted file mode 100644
index 1c42cc59c4..0000000000
--- a/packages/efl1/epsilon/compile-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- epsilon-0.3.0.004/src/lib/exiftags/exif.c~compile-fix
-+++ epsilon-0.3.0.004/src/lib/exiftags/exif.c
-@@ -48,7 +48,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
--#include <math.h>
- #include <float.h>
- #include <ctype.h>
- 
diff --git a/packages/efl1/epsilon/fix_alignment_error.patch b/packages/efl1/epsilon/fix_alignment_error.patch
new file mode 100644
index 0000000000..7a635bcf88
--- /dev/null
+++ b/packages/efl1/epsilon/fix_alignment_error.patch
@@ -0,0 +1,13 @@
+Index: epsilon/src/lib/exiftags/canon.c
+===================================================================
+--- epsilon.orig/src/lib/exiftags/canon.c	2007-12-03 17:45:27.000000000 -0300
++++ epsilon/src/lib/exiftags/canon.c	2007-12-03 17:46:59.000000000 -0300
+@@ -52,7 +52,7 @@
+ struct ccstm {
+ 	int32_t val;
+ 	struct descrip *table;
+-	const char descr[];
++	const char *descr;
+ };
+ 
+ 
diff --git a/packages/efl1/epsilon/server-is-not-client.patch b/packages/efl1/epsilon/server-is-not-client.patch
deleted file mode 100644
index e96e528b9e..0000000000
--- a/packages/efl1/epsilon/server-is-not-client.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/epsilon_private.h	2006-12-01 12:06:30.000000000 +0100
-+++ epsilon-0.3.0.007/src/include/epsilon_private.h	2006-12-01 12:07:10.928254000 +0100
-@@ -41,7 +41,7 @@
- Epsilon_Message *epsilon_message_new(int clientid, char *path, char *dst, int status);
- 
- int epsilon_ipc_client_send(Ecore_Con_Client *cl, Epsilon_Message *msg);
--int epsilon_ipc_server_send(Ecore_Con_Client *cl, Epsilon_Message *msg);
-+int epsilon_ipc_server_send(Ecore_Con_Server *srv, Epsilon_Message *msg);
- 
- Epsilon_Message *epsilon_ipc_consume(Epsilon_Ipc_End *end);
- 
diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb
index 8c71ef3e3d..0c12621d33 100644
--- a/packages/efl1/epsilon_cvs.bb
+++ b/packages/efl1/epsilon_cvs.bb
@@ -4,8 +4,11 @@ LICENSE = "MIT BSD"
 # can also depend on xine for movie thumbnails
 DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
 PV = "0.3.0.012+cvs${SRCDATE}"
+PR = "r1"
 
-inherit efl_library
+inherit efl
+
+SRC_URI += "file://fix_alignment_error.patch;patch=1"
 
 # a gstreamer thumbnailer would be nice now that we have emotion using gstreamer as well
 EXTRA_OECONF = "--disable-xine"
diff --git a/packages/efl1/esmart_cvs.bb b/packages/efl1/esmart_cvs.bb
index fa35d60d30..6cdae5754d 100644
--- a/packages/efl1/esmart_cvs.bb
+++ b/packages/efl1/esmart_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT BSD"
 DEPENDS = "evas ecore edje imlib2 epsilon libtool"
 PV = "0.9.0.042+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
diff --git a/packages/efl1/etk-native_cvs.bb b/packages/efl1/etk-native_cvs.bb
index 6770be4ab3..eedb832141 100644
--- a/packages/efl1/etk-native_cvs.bb
+++ b/packages/efl1/etk-native_cvs.bb
@@ -3,8 +3,3 @@ inherit native
 DEPENDS = "evas-native ecore-native edje-native"
 
 SRC_URI += "file://no-tests.patch;patch=1"
-
-do_stage_append() {
-	mv ${STAGING_DIR}/include/etk ${STAGING_INCDIR}
-}
-
diff --git a/packages/efl1/etk_cvs.bb b/packages/efl1/etk_cvs.bb
index 90df74e61c..a39129fc69 100644
--- a/packages/efl1/etk_cvs.bb
+++ b/packages/efl1/etk_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 PV = "0.1.0.042+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 # TODO package engines seperatly (do_split_packages)
 
@@ -16,3 +16,21 @@ FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la"
 FILES_${PN}-dbg += "${libdir}/etk/engines/.debug/"
 
 RRECOMMENDS_${PN} = "${PN}-engines"
+
+PACKAGES += "etk-engines-software-x11"
+FILES_${PN}-engines-software-x11 = "${libdir}/etk/engines/ecore_evas_software_x11.so"
+
+#PACKAGES =+ "etk-engines-gl-x11"
+#FILES_${PN}-engines-gl-x11 = "${libdir}/etk/engines/ecore_evas_gl_x11.so"
+
+PACKAGES =+ "etk-engines-evas"
+FILES_${PN}-engines-evas = "${libdir}/etk/engines/ecore_evas.so"
+
+PACKAGES =+ "etk-engines-fb"
+FILES_${PN}-engines-fb = "${libdir}/etk/engines/ecore_fb.so"
+
+PACKAGES =+ "etk-engines-x11"
+FILES_${PN}-engines-x11 = "${libdir}/etk/engines/ecore_evas_x11.so"
+
+PACKAGES =+ "etk-engines-software-x11-16"
+FILES_${PN}-engines-software-x11-16 = "${libdir}/etk/engines/ecore_evas_software_x11_16.so"
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index 77ec2db308..e4779d5b44 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender"
 PV = "0.9.9.042+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
 EXTRA_OECONF = "<override me>"
@@ -26,7 +26,6 @@ do_install_append() {
 
 FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
 FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
-FILES_${PN} = "${libdir}/libevas*.so*"
 
 PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
 
diff --git a/packages/efl1/evas/fix-configure.patch b/packages/efl1/evas/fix-configure.patch
deleted file mode 100644
index 1a5bf78e46..0000000000
--- a/packages/efl1/evas/fix-configure.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Index: evas/configure.in
-===================================================================
---- evas.orig/configure.in	2007-08-20 16:44:22.000000000 +0000
-+++ evas/configure.in	2007-08-20 16:49:08.000000000 +0000
-@@ -260,9 +260,7 @@
-   AC_CHECK_HEADER(X11/X.h,
-     [
-       AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
--      x_dir=${x_dir:-/usr/X11R6}
--      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+      x_libs="${x_libs} -lX11 -lXext"
-     ],
-     [
-       AC_MSG_RESULT(disabling software X11 engine)
-@@ -303,9 +301,7 @@
-   AC_CHECK_HEADER(X11/X.h,
-     [
-       AC_DEFINE(BUILD_ENGINE_SOFTWARE_16_X11, 1, [Software 16bit X11 Rendering Backend])
--      x_dir=${x_dir:-/usr/X11R6}
--      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+      x_libs="${x_libs} -lX11 -lXext"
-     ],
-     [
-       AC_MSG_RESULT(disabling software 16bit X11 engine)
-@@ -599,10 +595,7 @@
-       [
-         AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
-         AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
--        x_dir=${x_dir:-/usr/X11R6};
--        x_cflags=${x_cflags:--I$x_dir/include}
--        x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
--        gl_cflags="-I/usr/include"
-+        x_libs="${x_libs} -lX11 -lXext"
-         gl_libs="-lGL -lGLU -lpthread"
-         gl_dir=""
-       ],
-@@ -694,9 +687,7 @@
-       AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend])
-       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true)
-       AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
--      x_dir="/usr/X11R6";
--      x_cflags="-I"$x_dir"/include"
--      x_libs="-L"$x_dir"/lib -lX11 -lXext"
-+      x_libs="${x_libs} -lX11 -lXext"
-     ], [
-       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_X11, false)
-       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, false)
-@@ -738,9 +729,7 @@
-       AC_CHECK_HEADER(X11/extensions/Xrender.h,
-         [
-           AC_DEFINE(BUILD_ENGINE_XRENDER_X11, 1, [XRender X11 Rendering Backend])
--          x_dir=${x_dir:-/usr/X11R6}
--          x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--          x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
-+          x_libs="${x_libs} -lX11 -lXext -lXrender"
- 	],
- 	[
-           AC_MSG_RESULT(disabling xrender X11 engine)
-@@ -826,9 +815,7 @@
-     [
-       PKG_CHECK_MODULES(GLITZ, glitz glitz-glx,
- 	[
--          x_dir=${x_dir:-/usr/X11R6}
--          x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--          x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+          x_libs="${x_libs} -lX11 -lXext"
-           AC_DEFINE(BUILD_ENGINE_GLITZ_X11, 1, [Glitz X11 Rendering Backend])
-         ],
-         [
diff --git a/packages/efl1/evas/pagesize.patch b/packages/efl1/evas/pagesize.patch
deleted file mode 100644
index 5efd16a96e..0000000000
--- a/packages/efl1/evas/pagesize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/modules/engines/fb/evas_fb_main.c b/src/modules/engines/fb/evas_fb_main.c
-index e26c171..75e0743 100644
---- a/src/modules/engines/fb/evas_fb_main.c
-+++ b/src/modules/engines/fb/evas_fb_main.c
-@@ -530,7 +530,7 @@ fb_postinit(FB_Mode *mode)
-       fb_cleanup();
-       exit(1);
-     }
--  mode->mem_offset = (unsigned)(fb_fix.smem_start) & (~PAGE_MASK);
-+  mode->mem_offset = (unsigned)(fb_fix.smem_start) & (getpagesize()-1);
-   mode->mem = (unsigned char *)mmap(NULL, fb_fix.smem_len + mode->mem_offset,
- 				 PROT_WRITE | PROT_READ, MAP_SHARED, fb, 0);
-   if ((int)mode->mem == -1)
diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb
index 862cc51370..ebe604ec2b 100644
--- a/packages/efl1/evas_cvs.bb
+++ b/packages/efl1/evas_cvs.bb
@@ -47,6 +47,7 @@ EXTRA_OECONF = "\
 		--disable-convert-16-rgb-ipq	\
 		--enable-convert-16-rgb-rot-0	\
 		--enable-convert-16-rgb-rot-90	\
+		--disable-convert-16-rgb-rot-180 \
 		--enable-convert-16-rgb-rot-270	\
 		--enable-convert-24-rgb-888	\
 		--enable-convert-24-bgr-888	\
@@ -56,5 +57,6 @@ EXTRA_OECONF = "\
 		--enable-convert-32-bgrx-8888	\
 		--enable-convert-32-rgb-rot-0	\
 		--enable-convert-32-rgb-rot-90	\
+		--disable-convert-32-rgb-rot-180 \
 		--enable-convert-32-rgb-rot-270"
 
diff --git a/packages/efl1/evolve_cvs.bb b/packages/efl1/evolve_cvs.bb
index 272d90002e..02706eb978 100644
--- a/packages/efl1/evolve_cvs.bb
+++ b/packages/efl1/evolve_cvs.bb
@@ -3,4 +3,4 @@ LICENSE = "MIT"
 DEPENDS = "etk evolve-native"
 PV = "0.0.0+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb
index 15a777df67..eb00215891 100644
--- a/packages/efl1/ewl_cvs.bb
+++ b/packages/efl1/ewl_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 PV = "0.5.2.042+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 EXTRA_OECONF = "\
   --enable-software-x11 \
diff --git a/packages/efl1/exml_cvs.bb b/packages/efl1/exml_cvs.bb
index b94af05833..d63fa056bb 100644
--- a/packages/efl1/exml_cvs.bb
+++ b/packages/efl1/exml_cvs.bb
@@ -3,5 +3,5 @@ LICENSE = "MIT"
 DEPENDS = "libxml2 libxslt ecore"
 PV = "0.1.1+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
diff --git a/packages/efl1/imlib2_1.4.1.000.bb b/packages/efl1/imlib2_cvs.bb
index b0db13b5ce..c1d1f72791 100644
--- a/packages/efl1/imlib2_1.4.1.000.bb
+++ b/packages/efl1/imlib2_cvs.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipu
 LICENSE = "BSD"
 # can also depend on tiff34, ungif or gif, z, bz2, id3tag
 DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
+PV = "1.4.1.000+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 SRC_URI += "file://remove-local-includes.patch;patch=1"
 
diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/.mtn2git_empty b/packages/linux/linux-2.6.24/ts72xx/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/.mtn2git_empty
+++ b/packages/linux/linux-2.6.24/ts72xx/.mtn2git_empty
diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-gpio-interrupt-debounce.diff b/packages/linux/linux-2.6.24/ts72xx/ep93xx-gpio-interrupt-debounce.diff
index dbd2856e87..27146c30f1 100644
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-gpio-interrupt-debounce.diff
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-gpio-interrupt-debounce.diff
@@ -3,11 +3,11 @@ Implement GPIO interrupt debouncing on ep93xx.
 
 Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
 
-Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
+Index: linux-2.6.22/arch/arm/mach-ep93xx/core.c
 ===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/mach-ep93xx/core.c	2007-09-04 02:22:19.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c	2007-09-04 02:28:19.000000000 +0200
-@@ -154,6 +154,7 @@
+--- linux-2.6.22.orig/arch/arm/mach-ep93xx/core.c
++++ linux-2.6.22/arch/arm/mach-ep93xx/core.c
+@@ -154,6 +154,7 @@ struct sys_timer ep93xx_timer = {
   *************************************************************************/
  static unsigned char gpio_int_unmasked[3];
  static unsigned char gpio_int_enabled[3];
@@ -15,7 +15,7 @@ Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
  static unsigned char gpio_int_type1[3];
  static unsigned char gpio_int_type2[3];
  
-@@ -161,16 +162,19 @@
+@@ -161,16 +162,19 @@ static void update_gpio_int_params(int a
  {
  	if (abf == 0) {
  		__raw_writeb(0, EP93XX_GPIO_A_INT_ENABLE);
@@ -35,7 +35,7 @@ Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
  		__raw_writeb(gpio_int_type2[2], EP93XX_GPIO_F_INT_TYPE2);
  		__raw_writeb(gpio_int_type1[2], EP93XX_GPIO_F_INT_TYPE1);
  		__raw_writeb(gpio_int_unmasked[2] & gpio_int_enabled[2], EP93XX_GPIO_F_INT_ENABLE);
-@@ -361,6 +365,13 @@
+@@ -361,6 +365,13 @@ static int ep93xx_gpio_irq_type(unsigned
  	} else {
  		gpio_int_enabled[port] &= ~(1 << line);
  	}
@@ -49,10 +49,10 @@ Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
  	update_gpio_int_params(port);
  
  	return 0;
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h	2007-09-04 02:22:19.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h	2007-09-04 02:28:19.000000000 +0200
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h
 @@ -78,16 +78,19 @@
  #define EP93XX_GPIO_F_INT_ACK		EP93XX_GPIO_REG(0x54)
  #define EP93XX_GPIO_F_INT_ENABLE	EP93XX_GPIO_REG(0x58)
@@ -73,11 +73,11 @@ Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h
  
  #define EP93XX_AAC_BASE			(EP93XX_APB_VIRT_BASE + 0x00080000)
  
-Index: linux-2.6.23-rc5/include/linux/irq.h
+Index: linux-2.6.22/include/linux/irq.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/linux/irq.h	2007-09-04 02:24:58.000000000 +0200
-+++ linux-2.6.23-rc5/include/linux/irq.h	2007-09-04 02:25:01.000000000 +0200
-@@ -44,6 +44,7 @@
+--- linux-2.6.22.orig/include/linux/irq.h
++++ linux-2.6.22/include/linux/irq.h
+@@ -44,6 +44,7 @@ typedef	void fastcall (*irq_flow_handler
  #define IRQ_TYPE_LEVEL_LOW	0x00000008	/* Level low type */
  #define IRQ_TYPE_SENSE_MASK	0x0000000f	/* Mask of the above */
  #define IRQ_TYPE_PROBE		0x00000010	/* Probing in progress */
diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c-bus.diff b/packages/linux/linux-2.6.24/ts72xx/ep93xx-i2c-bus.diff
index efdbf42a45..d3c66940de 100644
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c-bus.diff
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-i2c-bus.diff
@@ -3,13 +3,13 @@ I2C bus driver using ep93xx GPIOs.
 
 Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
 
-Index: linux-2.6.23-rc5/drivers/i2c/busses/Kconfig
+Index: linux-2.6.22/drivers/i2c/busses/Kconfig
 ===================================================================
---- linux-2.6.23-rc5.orig/drivers/i2c/busses/Kconfig	2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/drivers/i2c/busses/Kconfig	2007-09-04 02:26:20.000000000 +0200
-@@ -654,4 +654,16 @@
- 	  This driver can also be built as module. If so, the module
- 	  will be called i2c-pmcmsp.
+--- linux-2.6.22.orig/drivers/i2c/busses/Kconfig	2007-08-30 00:42:45.000000000 +0200
++++ linux-2.6.22/drivers/i2c/busses/Kconfig	2007-08-30 00:42:52.000000000 +0200
+@@ -635,4 +635,16 @@
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called i2c-pnx.
  
 +config I2C_EP93XX
 +	tristate "Cirrus Logic EP93XX GPIO-based I2C interface"
@@ -24,10 +24,10 @@ Index: linux-2.6.23-rc5/drivers/i2c/busses/Kconfig
 +
 +
  endmenu
-Index: linux-2.6.23-rc5/drivers/i2c/busses/Makefile
+Index: linux-2.6.22/drivers/i2c/busses/Makefile
 ===================================================================
---- linux-2.6.23-rc5.orig/drivers/i2c/busses/Makefile	2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/drivers/i2c/busses/Makefile	2007-09-04 02:26:20.000000000 +0200
+--- linux-2.6.22.orig/drivers/i2c/busses/Makefile	2007-08-30 00:42:45.000000000 +0200
++++ linux-2.6.22/drivers/i2c/busses/Makefile	2007-08-30 00:42:52.000000000 +0200
 @@ -52,6 +52,7 @@
  obj-$(CONFIG_I2C_VOODOO3)	+= i2c-voodoo3.o
  obj-$(CONFIG_SCx200_ACB)	+= scx200_acb.o
@@ -36,10 +36,10 @@ Index: linux-2.6.23-rc5/drivers/i2c/busses/Makefile
  
  ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
  EXTRA_CFLAGS += -DDEBUG
-Index: linux-2.6.23-rc5/drivers/i2c/busses/i2c-ep93xx.c
+Index: linux-2.6.22/drivers/i2c/busses/i2c-ep93xx.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc5/drivers/i2c/busses/i2c-ep93xx.c	2007-09-04 02:26:20.000000000 +0200
++++ linux-2.6.22/drivers/i2c/busses/i2c-ep93xx.c	2007-08-30 00:42:52.000000000 +0200
 @@ -0,0 +1,159 @@
 +/*
 + * EP93XX I2C bus driver.
@@ -200,10 +200,10 @@ Index: linux-2.6.23-rc5/drivers/i2c/busses/i2c-ep93xx.c
 +MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>");
 +MODULE_DESCRIPTION("GPIO-based I2C adapter for EP93XX systems");
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/platform.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/platform.h	2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/platform.h	2007-09-04 02:28:19.000000000 +0200
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/platform.h	2007-08-30 00:42:45.000000000 +0200
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h	2007-08-30 00:42:52.000000000 +0200
 @@ -16,5 +16,13 @@
  	unsigned char	phy_id;
  };
diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c.diff b/packages/linux/linux-2.6.24/ts72xx/ep93xx-i2c.diff
index bf4622b1db..b68fb14e2e 100644
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c.diff
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-i2c.diff
@@ -4,10 +4,10 @@ code.
 
 Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
 
-Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
+Index: linux-2.6.22/arch/arm/mach-ep93xx/core.c
 ===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/mach-ep93xx/core.c	2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c	2007-09-04 02:28:12.000000000 +0200
+--- linux-2.6.22.orig/arch/arm/mach-ep93xx/core.c	2007-08-30 00:42:49.000000000 +0200
++++ linux-2.6.22/arch/arm/mach-ep93xx/core.c	2007-08-30 00:43:00.000000000 +0200
 @@ -509,6 +509,52 @@
  };
  
@@ -82,10 +82,10 @@ Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
  	platform_device_register(&ep93xx_ohci_device);
 +	platform_device_register(&ep93xx_i2c_device);
  }
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h	2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h	2007-09-04 02:28:10.000000000 +0200
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h	2007-08-30 00:42:49.000000000 +0200
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h	2007-08-30 00:43:00.000000000 +0200
 @@ -91,6 +91,7 @@
  #define EP93XX_GPIO_B_INT_ENABLE	EP93XX_GPIO_REG(0xb8)
  #define EP93XX_GPIO_B_INT_STATUS	EP93XX_GPIO_REG(0xbc)
@@ -94,10 +94,10 @@ Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h
  
  #define EP93XX_AAC_BASE			(EP93XX_APB_VIRT_BASE + 0x00080000)
  
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/platform.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/platform.h	2007-09-04 02:26:20.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/platform.h	2007-09-04 02:26:38.000000000 +0200
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/platform.h	2007-08-30 00:42:52.000000000 +0200
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h	2007-08-30 00:43:00.000000000 +0200
 @@ -10,6 +10,9 @@
  void ep93xx_init_devices(void);
  extern struct sys_timer ep93xx_timer;
diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-leds.diff b/packages/linux/linux-2.6.24/ts72xx/ep93xx-leds.diff
index e158593f28..9836145c24 100644
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-leds.diff
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-leds.diff
@@ -3,11 +3,11 @@ EP93xx leds driver
 
 Signed-off-by: Petr Stetiar <ynezz@true.cz>
 
-Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
+Index: linux-2.6.24/arch/arm/mach-ep93xx/core.c
 ===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/mach-ep93xx/core.c	2007-09-04 02:40:19.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c	2007-09-04 02:40:25.000000000 +0200
-@@ -568,6 +568,12 @@
+--- linux-2.6.24.orig/arch/arm/mach-ep93xx/core.c	2008-02-03 13:06:34.000000000 +0100
++++ linux-2.6.24/arch/arm/mach-ep93xx/core.c	2008-02-03 13:38:46.000000000 +0100
+@@ -555,6 +555,12 @@
  }
  
  
@@ -20,19 +20,19 @@ Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
  void __init ep93xx_init_devices(void)
  {
  	unsigned int v;
-@@ -596,4 +602,5 @@
+@@ -583,4 +589,5 @@
  	platform_device_register(&ep93xx_rtc_device);
  	platform_device_register(&ep93xx_ohci_device);
  	platform_device_register(&ep93xx_i2c_device);
 +	platform_device_register(&ep93xx_led_device);
  }
-Index: linux-2.6.23-rc5/drivers/leds/Kconfig
+Index: linux-2.6.24/drivers/leds/Kconfig
 ===================================================================
---- linux-2.6.23-rc5.orig/drivers/leds/Kconfig	2007-09-04 02:40:19.000000000 +0200
-+++ linux-2.6.23-rc5/drivers/leds/Kconfig	2007-09-04 02:40:25.000000000 +0200
-@@ -101,6 +101,12 @@
- 	  outputs. To be useful the particular board must have LEDs
- 	  and they must be connected to the GPIO lines.
+--- linux-2.6.24.orig/drivers/leds/Kconfig	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/leds/Kconfig	2008-02-03 13:38:46.000000000 +0100
+@@ -114,6 +114,12 @@
+ 	help
+ 	  This option enables support for the CM-X270 LEDs.
  
 +config LEDS_EP93XX
 +	tristate "LED Support for Cirrus Logic EP93xx"
@@ -43,22 +43,22 @@ Index: linux-2.6.23-rc5/drivers/leds/Kconfig
  comment "LED Triggers"
  
  config LEDS_TRIGGERS
-Index: linux-2.6.23-rc5/drivers/leds/Makefile
+Index: linux-2.6.24/drivers/leds/Makefile
 ===================================================================
---- linux-2.6.23-rc5.orig/drivers/leds/Makefile	2007-09-04 02:40:19.000000000 +0200
-+++ linux-2.6.23-rc5/drivers/leds/Makefile	2007-09-04 02:40:25.000000000 +0200
-@@ -16,6 +16,7 @@
- obj-$(CONFIG_LEDS_WRAP)			+= leds-wrap.o
- obj-$(CONFIG_LEDS_H1940)		+= leds-h1940.o
- obj-$(CONFIG_LEDS_COBALT)		+= leds-cobalt.o
-+obj-$(CONFIG_LEDS_EP93XX)		+= leds-ep93xx.o
+--- linux-2.6.24.orig/drivers/leds/Makefile	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/leds/Makefile	2008-02-03 13:40:49.000000000 +0100
+@@ -19,6 +19,7 @@
+ obj-$(CONFIG_LEDS_COBALT_RAQ)		+= leds-cobalt-raq.o
  obj-$(CONFIG_LEDS_GPIO)			+= leds-gpio.o
+ obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o
++obj-$(CONFIG_LEDS_EP93XX)		+= leds-ep93xx.o
  
  # LED Triggers
-Index: linux-2.6.23-rc5/drivers/leds/leds-ep93xx.c
+ obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
+Index: linux-2.6.24/drivers/leds/leds-ep93xx.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc5/drivers/leds/leds-ep93xx.c	2007-09-04 02:40:25.000000000 +0200
++++ linux-2.6.24/drivers/leds/leds-ep93xx.c	2008-02-03 13:38:46.000000000 +0100
 @@ -0,0 +1,119 @@
 +/*
 + * LEDs driver for Cirrus Logic EP93xx
diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-maverick-uniqid.patch b/packages/linux/linux-2.6.24/ts72xx/ep93xx-maverick-uniqid.patch
index 0bc8190464..fb6c8cfe18 100644
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-maverick-uniqid.patch
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-maverick-uniqid.patch
@@ -3,11 +3,11 @@ Adds support for SoC's unique ID (Maverick Key) in /proc/cpuinfo
 
 Signed-off-by: Petr Stetiar <ynezz@true.cz>
 
-Index: linux-2.6.23-rc5/arch/arm/kernel/setup.c
+Index: linux-2.6.22/arch/arm/kernel/setup.c
 ===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/kernel/setup.c	2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/kernel/setup.c	2007-09-04 02:26:49.000000000 +0200
-@@ -964,8 +964,15 @@
+--- linux-2.6.22.orig/arch/arm/kernel/setup.c	2007-09-02 23:08:51.000000000 +0200
++++ linux-2.6.22/arch/arm/kernel/setup.c	2007-09-02 23:10:24.000000000 +0200
+@@ -959,8 +959,15 @@
  
  	seq_printf(m, "Hardware\t: %s\n", machine_name);
  	seq_printf(m, "Revision\t: %04x\n", system_rev);
@@ -23,10 +23,10 @@ Index: linux-2.6.23-rc5/arch/arm/kernel/setup.c
  
  	return 0;
  }
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h	2007-09-04 02:26:38.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h	2007-09-04 02:26:49.000000000 +0200
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h	2007-09-02 23:06:45.000000000 +0200
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h	2007-09-02 23:08:34.000000000 +0200
 @@ -70,6 +70,8 @@
  #define EP93XX_I2S_BASE			(EP93XX_APB_VIRT_BASE + 0x00020000)
  
diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-serial-clocks.diff b/packages/linux/linux-2.6.24/ts72xx/ep93xx-serial-clocks.diff
index 86b14894b6..9eb2d9de98 100644
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-serial-clocks.diff
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-serial-clocks.diff
@@ -4,11 +4,11 @@ so that using ttyAM1 or ttyAM2 as console can work.
 
 Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
 
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/uncompress.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/uncompress.h	2007-09-04 02:26:42.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/uncompress.h	2007-09-04 02:26:47.000000000 +0200
-@@ -78,6 +78,23 @@
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/uncompress.h
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h
+@@ -78,6 +78,23 @@ static void ethernet_reset(void)
  
  
  /*
@@ -32,7 +32,7 @@ Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/uncompress.h
   * Some bootloaders don't turn on the UARTBAUD bit, which means that
   * the UARTs will be running off a divided 7.3728 MHz clock instead of
   * the 14.7456 MHz peripheral clock when linux boots.
-@@ -126,6 +143,7 @@
+@@ -126,6 +143,7 @@ static void fix_uart_base(void)
  static void arch_decomp_setup(void)
  {
  	ethernet_reset();
diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-serial-uartbaud.diff b/packages/linux/linux-2.6.24/ts72xx/ep93xx-serial-uartbaud.diff
index 9cfaacd103..7183ab626e 100644
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-serial-uartbaud.diff
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-serial-uartbaud.diff
@@ -3,11 +3,11 @@ Force UARTBAUD on before uncompressing.
 
 Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
 
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/uncompress.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/uncompress.h	2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/uncompress.h	2007-09-04 02:28:14.000000000 +0200
-@@ -77,9 +77,56 @@
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/uncompress.h
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h
+@@ -77,9 +77,56 @@ static void ethernet_reset(void)
  }
  
  
diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-timer-accuracy.diff b/packages/linux/linux-2.6.24/ts72xx/ep93xx-timer-accuracy.diff
index 8a6de2e7da..8254153b69 100644
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-timer-accuracy.diff
+++ b/packages/linux/linux-2.6.24/ts72xx/ep93xx-timer-accuracy.diff
@@ -5,11 +5,11 @@ ticks until the next jiffy in a fractional value representation.
 
 Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
 
-Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
+Index: linux-2.6.22/arch/arm/mach-ep93xx/core.c
 ===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/mach-ep93xx/core.c	2007-09-04 02:26:38.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c	2007-09-04 02:26:48.000000000 +0200
-@@ -94,19 +94,32 @@
+--- linux-2.6.22.orig/arch/arm/mach-ep93xx/core.c
++++ linux-2.6.22/arch/arm/mach-ep93xx/core.c
+@@ -94,19 +94,32 @@ void __init ep93xx_map_io(void)
   * track of lost jiffies.
   */
  static unsigned int last_jiffy_time;
@@ -47,10 +47,10 @@ Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c
  	}
  
  	write_sequnlock(&xtime_lock);
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/timex.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/timex.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/timex.h	2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/timex.h	2007-09-04 02:26:48.000000000 +0200
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/timex.h
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/timex.h
 @@ -2,4 +2,4 @@
   * linux/include/asm-arm/arch-ep93xx/timex.h
   */
diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/series b/packages/linux/linux-2.6.24/ts72xx/series
index e5455efd3c..3295838606 100644
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/series
+++ b/packages/linux/linux-2.6.24/ts72xx/series
@@ -10,3 +10,4 @@ ts72xx-machine-id-fix.patch
 ts72xx-nfbit-fix.patch
 ts72xx-watchdog.patch 
 ts72xx-use-cpld-reset.patch
+ts72xx-rs485.patch
diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-machine-id-fix.patch b/packages/linux/linux-2.6.24/ts72xx/ts72xx-machine-id-fix.patch
index 47a07e64e1..64c38398db 100644
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-machine-id-fix.patch
+++ b/packages/linux/linux-2.6.24/ts72xx/ts72xx-machine-id-fix.patch
@@ -3,11 +3,11 @@ Fix wrong machine ID passed from RedBoot
 
 Signed-off-by: Petr Stetiar <ynezz@true.cz>
 
-Index: linux-2.6.23-rc5/arch/arm/kernel/head.S
+Index: linux-2.6.22/arch/arm/kernel/head.S
 ===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/kernel/head.S	2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/kernel/head.S	2007-09-04 02:26:57.000000000 +0200
-@@ -86,6 +86,7 @@
+--- linux-2.6.22.orig/arch/arm/kernel/head.S	2007-08-30 00:42:45.000000000 +0200
++++ linux-2.6.22/arch/arm/kernel/head.S	2007-08-30 00:43:13.000000000 +0200
+@@ -82,6 +82,7 @@
  	bl	__lookup_processor_type		@ r5=procinfo r9=cpuid
  	movs	r10, r5				@ invalid processor (r5=0)?
  	beq	__error_p			@ yes, error 'p'
diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-nfbit-fix.patch b/packages/linux/linux-2.6.24/ts72xx/ts72xx-nfbit-fix.patch
index bed3de37e9..eab73154a8 100644
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-nfbit-fix.patch
+++ b/packages/linux/linux-2.6.24/ts72xx/ts72xx-nfbit-fix.patch
@@ -4,10 +4,8 @@ then the CPU core will run from HCLK instead of FCLK, and performance will
 suffer. If you see BogoMIPS of about 1/4 of your CPU clock, try turning this
 on; your performance should double.
 
-Index: linux-2.6.23-rc5/arch/arm/mm/proc-arm920.S
-===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/mm/proc-arm920.S	2007-09-04 02:25:36.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/mm/proc-arm920.S	2007-09-04 02:27:02.000000000 +0200
+--- linux-2.6.21.4/arch/arm/mm/proc-arm920.S	2007-06-07 23:27:31.000000000 +0200
++++ linux-2.6.21.4-arm/arch/arm/mm/proc-arm920.S	2007-06-08 22:59:48.000000000 +0200
 @@ -395,6 +395,7 @@
  	mrc	p15, 0, r0, c1, c0		@ get control register v4
  	bic	r0, r0, r5
@@ -15,4 +13,3 @@ Index: linux-2.6.23-rc5/arch/arm/mm/proc-arm920.S
 +	orr     r0, r0, #0x40000000
  	mov	pc, lr
  	.size	__arm920_setup, . - __arm920_setup
- 
diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-use-cpld-reset.patch b/packages/linux/linux-2.6.24/ts72xx/ts72xx-use-cpld-reset.patch
index 681622a9ae..9744a67653 100644
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-use-cpld-reset.patch
+++ b/packages/linux/linux-2.6.24/ts72xx/ts72xx-use-cpld-reset.patch
@@ -4,10 +4,10 @@ sometimes get stuck...
 
 Signed-off-by: Petr Stetiar <ynezz@true.cz>
 
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/system.h
+Index: linux-2.6.22/include/asm-arm/arch-ep93xx/system.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/system.h	2007-09-04 02:29:35.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/system.h	2007-09-04 02:31:52.000000000 +0200
+--- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/system.h	2007-08-30 00:53:47.000000000 +0200
++++ linux-2.6.22/include/asm-arm/arch-ep93xx/system.h	2007-08-30 00:54:28.000000000 +0200
 @@ -3,6 +3,7 @@
   */
  
diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-watchdog.patch b/packages/linux/linux-2.6.24/ts72xx/ts72xx-watchdog.patch
index b406d1db77..ff29c14b55 100644
--- a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-watchdog.patch
+++ b/packages/linux/linux-2.6.24/ts72xx/ts72xx-watchdog.patch
@@ -3,10 +3,10 @@ TS-72xx watchdog driver
 
 Signed-off-by: Matthieu Crapet <mcrapet@gmail.com>
 
-Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/ts72xx.c
+Index: linux-2.6.24/arch/arm/mach-ep93xx/ts72xx.c
 ===================================================================
---- linux-2.6.23-rc5.orig/arch/arm/mach-ep93xx/ts72xx.c	2007-09-04 02:25:35.000000000 +0200
-+++ linux-2.6.23-rc5/arch/arm/mach-ep93xx/ts72xx.c	2007-09-04 02:27:06.000000000 +0200
+--- linux-2.6.24.orig/arch/arm/mach-ep93xx/ts72xx.c	2008-02-03 14:09:54.000000000 +0100
++++ linux-2.6.24/arch/arm/mach-ep93xx/ts72xx.c	2008-02-03 14:16:09.000000000 +0100
 @@ -183,6 +183,26 @@
  	.resource	= ts72xx_eth_resource,
  };
@@ -42,10 +42,10 @@ Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/ts72xx.c
  }
  
  MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC")
-Index: linux-2.6.23-rc5/drivers/char/watchdog/Kconfig
+Index: linux-2.6.24/drivers/watchdog/Kconfig
 ===================================================================
---- linux-2.6.23-rc5.orig/drivers/char/watchdog/Kconfig	2007-09-04 02:25:35.000000000 +0200
-+++ linux-2.6.23-rc5/drivers/char/watchdog/Kconfig	2007-09-04 02:27:06.000000000 +0200
+--- linux-2.6.24.orig/drivers/watchdog/Kconfig	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/watchdog/Kconfig	2008-02-03 14:16:09.000000000 +0100
 @@ -247,6 +247,18 @@
  
  # H8300 Architecture
@@ -65,10 +65,10 @@ Index: linux-2.6.23-rc5/drivers/char/watchdog/Kconfig
  # X86 (i386 + ia64 + x86_64) Architecture
  
  config ACQUIRE_WDT
-Index: linux-2.6.23-rc5/drivers/char/watchdog/Makefile
+Index: linux-2.6.24/drivers/watchdog/Makefile
 ===================================================================
---- linux-2.6.23-rc5.orig/drivers/char/watchdog/Makefile	2007-09-04 02:25:35.000000000 +0200
-+++ linux-2.6.23-rc5/drivers/char/watchdog/Makefile	2007-09-04 02:27:06.000000000 +0200
+--- linux-2.6.24.orig/drivers/watchdog/Makefile	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/watchdog/Makefile	2008-02-03 14:16:09.000000000 +0100
 @@ -36,6 +36,7 @@
  obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
  obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
@@ -77,10 +77,10 @@ Index: linux-2.6.23-rc5/drivers/char/watchdog/Makefile
  obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o
  obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o
  obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
-Index: linux-2.6.23-rc5/drivers/char/watchdog/ts72xx_wdt.c
+Index: linux-2.6.24/drivers/watchdog/ts72xx_wdt.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc5/drivers/char/watchdog/ts72xx_wdt.c	2007-09-04 02:27:06.000000000 +0200
++++ linux-2.6.24/drivers/watchdog/ts72xx_wdt.c	2008-02-03 14:16:09.000000000 +0100
 @@ -0,0 +1,332 @@
 +/*
 + *	TS-72xx Watchdog Driver for Technologic Systems boards.
@@ -414,10 +414,10 @@ Index: linux-2.6.23-rc5/drivers/char/watchdog/ts72xx_wdt.c
 +MODULE_DESCRIPTION("TS-72xx watchdog driver");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ts72xx.h
+Index: linux-2.6.24/include/asm-arm/arch-ep93xx/ts72xx.h
 ===================================================================
---- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/ts72xx.h	2007-09-04 02:25:35.000000000 +0200
-+++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ts72xx.h	2007-09-04 02:27:06.000000000 +0200
+--- linux-2.6.24.orig/include/asm-arm/arch-ep93xx/ts72xx.h	2008-02-03 14:09:54.000000000 +0100
++++ linux-2.6.24/include/asm-arm/arch-ep93xx/ts72xx.h	2008-02-03 14:16:09.000000000 +0100
 @@ -69,6 +69,9 @@
  #define TS72XX_RTC_DATA_SIZE		0x00001000
  
diff --git a/packages/tetex/.mtn2git_empty b/packages/linux/linux-omap1-2.6.24-omap1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/tetex/.mtn2git_empty
+++ b/packages/linux/linux-omap1-2.6.24-omap1/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.24-omap1/binutils-buildid-arm.patch b/packages/linux/linux-omap1-2.6.24-omap1/binutils-buildid-arm.patch
new file mode 100644
index 0000000000..edd224f4dd
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.24-omap1/binutils-buildid-arm.patch
@@ -0,0 +1,12 @@
+diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
+index 5ff5406..538fcb5 100644
+--- a/arch/arm/kernel/vmlinux.lds.S
++++ b/arch/arm/kernel/vmlinux.lds.S
+@@ -94,6 +94,7 @@ SECTIONS
+ 			TEXT_TEXT
+ 			SCHED_TEXT
+ 			LOCK_TEXT
++			*(.note.*)
+ #ifdef CONFIG_MMU
+ 			*(.fixup)
+ #endif
diff --git a/packages/linux/linux-omap1-2.6.24-omap1/defconfig b/packages/linux/linux-omap1-2.6.24-omap1/defconfig
new file mode 100644
index 0000000000..543714da23
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.24-omap1/defconfig
@@ -0,0 +1,1092 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.24-omap1
+# Fri Mar 21 08:40:14 2008
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
+CONFIG_ARCH_OMAP=y
+
+#
+# TI OMAP Implementations
+#
+CONFIG_ARCH_OMAP_OTG=y
+CONFIG_ARCH_OMAP1=y
+# CONFIG_ARCH_OMAP2 is not set
+# CONFIG_ARCH_OMAP3 is not set
+
+#
+# OMAP Feature Selections
+#
+CONFIG_OMAP_DEBUG_SRAM_PATCH=y
+CONFIG_OMAP_RESET_CLOCKS=y
+# CONFIG_OMAP_BOOT_TAG is not set
+# CONFIG_OMAP_GPIO_SWITCH is not set
+CONFIG_OMAP_MUX=y
+# CONFIG_OMAP_MUX_DEBUG is not set
+CONFIG_OMAP_MUX_WARNINGS=y
+# CONFIG_OMAP_STI is not set
+CONFIG_OMAP_MCBSP=y
+# CONFIG_OMAP_MMU_FWK is not set
+# CONFIG_OMAP_MBOX_FWK is not set
+# CONFIG_OMAP_MPU_TIMER is not set
+CONFIG_OMAP_32K_TIMER=y
+CONFIG_OMAP_32K_TIMER_HZ=128
+# CONFIG_OMAP_DM_TIMER is not set
+CONFIG_OMAP_LL_DEBUG_UART1=y
+# CONFIG_OMAP_LL_DEBUG_UART2 is not set
+# CONFIG_OMAP_LL_DEBUG_UART3 is not set
+CONFIG_OMAP_SERIAL_WAKE=y
+
+#
+# OMAP Core Type
+#
+# CONFIG_ARCH_OMAP730 is not set
+# CONFIG_ARCH_OMAP15XX is not set
+CONFIG_ARCH_OMAP16XX=y
+
+#
+# OMAP Board Type
+#
+# CONFIG_MACH_OMAP_INNOVATOR is not set
+# CONFIG_MACH_OMAP_H2 is not set
+# CONFIG_MACH_OMAP_H3 is not set
+CONFIG_MACH_OMAP_OSK=y
+# CONFIG_OMAP_OSK_MISTRAL is not set
+# CONFIG_MACH_NOKIA770 is not set
+# CONFIG_MACH_OMAP_GENERIC is not set
+
+#
+# OMAP CPU Speed
+#
+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set
+# CONFIG_OMAP_ARM_216MHZ is not set
+CONFIG_OMAP_ARM_192MHZ=y
+# CONFIG_OMAP_ARM_168MHZ is not set
+# CONFIG_OMAP_ARM_120MHZ is not set
+# CONFIG_OMAP_ARM_60MHZ is not set
+# CONFIG_OMAP_ARM_30MHZ is not set
+
+#
+# Boot options
+#
+
+#
+# Power management
+#
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_PABRT_NOIFAR=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+# CONFIG_OUTER_CACHE is not set
+
+#
+# Bus support
+#
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCCARD=y
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+
+#
+# PC-card bridges
+#
+CONFIG_OMAP_CF=y
+
+#
+# Kernel Features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_PREEMPT is not set
+CONFIG_HZ=128
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw"
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+# CONFIG_VFP is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_SUSPEND=y
+# CONFIG_APM_EMULATION is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_OMAP_NOR=y
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
+CONFIG_IDE=m
+CONFIG_BLK_DEV_IDE=m
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=m
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_BLK_DEV_PLATFORM is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_AX88796 is not set
+CONFIG_SMC91X=y
+# CONFIG_DM9000 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_B44 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_NET_PCMCIA is not set
+# CONFIG_WAN is not set
+CONFIG_PPP=y
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_FILTER is not set
+# CONFIG_PPP_ASYNC is not set
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPP_DEFLATE is not set
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=y
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+CONFIG_KEYBOARD_OMAP=y
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_CS is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_OMAP=m
+# CONFIG_NVRAM is not set
+# CONFIG_R3964 is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=y
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_ISP1301_OMAP is not set
+CONFIG_TPS65010=y
+# CONFIG_SENSORS_TLV320AIC23 is not set
+# CONFIG_GPIOEXPANDER_OMAP is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_OMAP=y
+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set
+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
+# CONFIG_FB_OMAP_DMA_TUNE is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+CONFIG_HID_DEBUG=y
+# CONFIG_HIDRAW is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB is not set
+
+#
+# Enable Host or Gadget support to see Inventra options
+#
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_NEW_LEDS is not set
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+
+#
+# CBUS support
+#
+# CONFIG_CBUS is not set
+# CONFIG_OMAP_DSP is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+CONFIG_AUTOFS_FS=y
+CONFIG_AUTOFS4_FS=y
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+# CONFIG_TMPFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=m
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_DLM is not set
+CONFIG_INSTRUMENTATION=y
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_SAMPLES is not set
+# CONFIG_DEBUG_USER is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/packages/linux/linux-omap1_2.6.24-omap1.bb b/packages/linux/linux-omap1_2.6.24-omap1.bb
new file mode 100644
index 0000000000..f5ed1a43f9
--- /dev/null
+++ b/packages/linux/linux-omap1_2.6.24-omap1.bb
@@ -0,0 +1,10 @@
+require linux-omap.inc
+
+COMPATIBLE_MACHINE = "omap5912osk"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
+           http://www.muru.com/linux/omap/patches/patch-2.6.24-omap1.bz2;patch=1 \
+           file://binutils-buildid-arm.patch;patch=1 \
+	   file://defconfig"
+
+S = "${WORKDIR}/linux-2.6.24"
diff --git a/packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch b/packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch
new file mode 100644
index 0000000000..4414b21191
--- /dev/null
+++ b/packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch
@@ -0,0 +1,12 @@
+Index: linux-2.6.13/drivers/ide/legacy/ide-cs.c
+===================================================================
+--- linux-2.6.13.orig/drivers/ide/legacy/ide-cs.c	2005-09-01 22:43:46.000000000 +0100
++++ linux-2.6.13/drivers/ide/legacy/ide-cs.c	2005-09-01 22:45:46.000000000 +0100
+@@ -488,7 +488,6 @@
+ 	PCMCIA_DEVICE_PROD_ID123("KODAK Picture Card       ", "KODAK  ", "V100K", 0x94a0d8f3, 0xe4fc3ea0, 0xe5e7eed4),
+ 	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
+ 	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
+-	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
+ 	PCMCIA_DEVICE_NULL,
+ };
+ MODULE_DEVICE_TABLE(pcmcia, ide_ids);
diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb
index 7fc1aa38ca..a3ae2f9248 100644
--- a/packages/linux/linux_2.6.24.bb
+++ b/packages/linux/linux_2.6.24.bb
@@ -8,10 +8,11 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
 DEFAULT_PREFERENCE_simpad = "1"
 DEFAULT_PREFERENCE_atngw100 = "1"
 DEFAULT_PREFERENCE_at32stk1000 = "1"
+DEFAULT_PREFERENCE_ts72xx = "1"
 
 DEPENDS_append_mpc8313e-rdb = " dtc-native"
 
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
            http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
@@ -34,7 +35,8 @@ SRC_URI_append_simpad = "\
            file://linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch;patch=1 \
            file://linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch;patch=1 \ 
            file://linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1 \
-           file://collie-kexec.patch;patch=1 \
+           file://connectplus-remove-ide-HACK.patch;patch=1 \
+	   file://collie-kexec.patch;patch=1 \
            file://export_atags-r2.patch;patch=1 \
            "	   
 
@@ -63,6 +65,20 @@ SRC_URI_avr32 = "http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.24.
                  file://defconfig"
 S_avr32 = "${WORKDIR}/linux-2.6.24.3.atmel.3"
 
+SRC_URI_append_ts72xx = "\
+	file://ep93xx-gpio-interrupt-debounce.diff;patch=1 \
+	file://ep93xx-i2c-bus.diff;patch=1 \
+	file://ep93xx-i2c.diff;patch=1 \
+	file://ep93xx-leds.diff;patch=1 \
+	file://ep93xx-serial-uartbaud.diff;patch=1 \
+	file://ep93xx-serial-clocks.diff;patch=1 \
+	file://ep93xx-timer-accuracy.diff;patch=1 \
+	file://ep93xx-maverick-uniqid.patch;patch=1 \
+	file://ts72xx-nfbit-fix.patch;patch=1 \
+	file://ts72xx-machine-id-fix.patch;patch=1 \
+	file://ts72xx-watchdog.patch;patch=1 \
+	file://ts72xx-use-cpld-reset.patch;patch=1 \
+	file://ts72xx-rs485.patch;patch=1"
 
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
 
diff --git a/packages/tetex/files/.mtn2git_empty b/packages/nonworking/tetex/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/tetex/files/.mtn2git_empty
+++ b/packages/nonworking/tetex/.mtn2git_empty
diff --git a/packages/twisted/twisted-2.5.0/.mtn2git_empty b/packages/nonworking/tetex/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/twisted/twisted-2.5.0/.mtn2git_empty
+++ b/packages/nonworking/tetex/files/.mtn2git_empty
diff --git a/packages/tetex/files/configure.patch b/packages/nonworking/tetex/files/configure.patch
index 7a955917df..7a955917df 100644
--- a/packages/tetex/files/configure.patch
+++ b/packages/nonworking/tetex/files/configure.patch
diff --git a/packages/tetex/tetex-native_3.0.bb b/packages/nonworking/tetex/tetex-native_3.0.bb
index 4d683ff3d1..4d683ff3d1 100644
--- a/packages/tetex/tetex-native_3.0.bb
+++ b/packages/nonworking/tetex/tetex-native_3.0.bb
diff --git a/packages/tetex/tetex-texmf_3.0.bb b/packages/nonworking/tetex/tetex-texmf_3.0.bb
index 80d6f779d8..80d6f779d8 100644
--- a/packages/tetex/tetex-texmf_3.0.bb
+++ b/packages/nonworking/tetex/tetex-texmf_3.0.bb
diff --git a/packages/tetex/tetex_3.0.bb b/packages/nonworking/tetex/tetex_3.0.bb
index eedf8820b2..eedf8820b2 100644
--- a/packages/tetex/tetex_3.0.bb
+++ b/packages/nonworking/tetex/tetex_3.0.bb
diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc
index 9c4e68dfce..c098494d17 100644
--- a/packages/python/python-2.5-manifest.inc
+++ b/packages/python/python-2.5-manifest.inc
@@ -1,5 +1,5 @@
-#######################################################################################################################
-### AUTO-GENERATED by './contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Thu Mar  6 18:04:21 2008
+########################################################################################################################
+### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Fri Mar 21 18:43:05 2008
 ###
 ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 ###
@@ -8,9 +8,9 @@
 ########################################################################################################################
  
 
-PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
 
-PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
 
 DESCRIPTION_python-profile="Python Basic Profiling Support"
 PR_python-profile="ml0"
@@ -97,6 +97,11 @@ PR_python-image="ml0"
 RDEPENDS_python-image="python-core"
 FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so "
 
+DESCRIPTION_python-tests="Python Tests"
+PR_python-tests="ml0"
+RDEPENDS_python-tests="python-core"
+FILES_python-tests="${libdir}/python2.5/test "
+
 DESCRIPTION_python-core-dbg="Python core module debug information"
 PR_python-core-dbg="ml0"
 RDEPENDS_python-core-dbg="python-core"
@@ -213,14 +218,14 @@ RDEPENDS_python-mime="python-core python-io"
 FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* "
 
 DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support"
-PR_python-sqlite3="ml1"
-RDEPENDS_python-sqlite3="python-core"
-FILES_python-sqlite3="${libdir}/python2.5/lib-dynload/_sqlite3.so ${libdir}/python2.5/sqlite3 "
-
-DESCRIPTION_python-tests="Python Tests"
-PR_python-tests="ml0"
-RDEPENDS_python-tests="python-core"
-FILES_python-tests="${libdir}/python2.5/test "
+PR_python-sqlite3="ml2"
+RDEPENDS_python-sqlite3="python-core python-datetime python-lang python-crypt python-io python-threading python-zlib"
+FILES_python-sqlite3="${libdir}/python2.5/lib-dynload/_sqlite3.so ${libdir}/python2.5/sqlite3/dbapi2.* ${libdir}/python2.5/sqlite3/__init__.* "
+
+DESCRIPTION_python-sqlite3-tests="Python Sqlite3 Database Support Tests"
+PR_python-sqlite3-tests="ml0"
+RDEPENDS_python-sqlite3-tests="python-core python-sqlite3"
+FILES_python-sqlite3-tests="${libdir}/python2.5/sqlite3/test "
 
 DESCRIPTION_python-unittest="Python Unit Testing Framework"
 PR_python-unittest="ml0"
diff --git a/packages/python/python-ecore_cvs.bb b/packages/python/python-ecore_cvs.bb
index 73c4b7ea00..663551f3a4 100644
--- a/packages/python/python-ecore_cvs.bb
+++ b/packages/python/python-ecore_cvs.bb
@@ -1,9 +1,9 @@
 require python-efl.inc
 DEPENDS += "python-evas ecore"
+RDEPENDS += "python-evas"
 PV = "0.2.1+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 do_stage() {
     distutils_stage_all
 }
-
diff --git a/packages/python/python-edbus_cvs.bb b/packages/python/python-edbus_cvs.bb
index dc4b09cee8..75bdc7ff80 100644
--- a/packages/python/python-edbus_cvs.bb
+++ b/packages/python/python-edbus_cvs.bb
@@ -1,7 +1,8 @@
 require python-efl.inc
 DEPENDS += "edbus python-dbus"
+RDEPENDS += "python-dbus"
 PV = "0.1.1+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus"
 S = "${WORKDIR}/python-e_dbus"
diff --git a/packages/python/python-edje_cvs.bb b/packages/python/python-edje_cvs.bb
index 3ee4b1decd..144fcfddde 100644
--- a/packages/python/python-edje_cvs.bb
+++ b/packages/python/python-edje_cvs.bb
@@ -1,5 +1,5 @@
 require python-efl.inc
 DEPENDS += "edje python-evas"
+RDEPENDS += "python-evas"
 PV = "0.2.1+cvs${SRCDATE}"
-PR = "r0"
-
+PR = "r2"
diff --git a/packages/python/python-epsilon_cvs.bb b/packages/python/python-epsilon_cvs.bb
index f979159b49..55ba0c1346 100644
--- a/packages/python/python-epsilon_cvs.bb
+++ b/packages/python/python-epsilon_cvs.bb
@@ -1,4 +1,5 @@
 require python-efl.inc
 DEPENDS += "epsilon python-ecore"
+RDEPENDS += "python-ecore"
 PV = "0.2.1+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
diff --git a/packages/python/python-formencode_svn.bb b/packages/python/python-formencode_svn.bb
index 80a1ba2e5b..97dd5be64b 100644
--- a/packages/python/python-formencode_svn.bb
+++ b/packages/python/python-formencode_svn.bb
@@ -5,9 +5,9 @@ LICENSE = "LGPL"
 DEPENDS = "sqlite3"
 SRCNAME = "FormEncode"
 PV = "0.4+svnr${SRCREV}"
-PR = "ml0"
+PR = "ml1"
 
-inherit distutils
+inherit setuptools
 
 SRC_URI = "svn://svn.colorstudy.com/FormEncode;module=trunk;proto=http"
 
diff --git a/packages/python/python-pygtk/prevent_to_get_display_during_import.patch b/packages/python/python-pygtk/prevent_to_get_display_during_import.patch
new file mode 100644
index 0000000000..db3469ef57
--- /dev/null
+++ b/packages/python/python-pygtk/prevent_to_get_display_during_import.patch
@@ -0,0 +1,14 @@
+Index: pygtk-2.10.4/gtk/__init__.py
+===================================================================
+--- pygtk-2.10.4.orig/gtk/__init__.py	2007-11-27 19:27:05.000000000 -0300
++++ pygtk-2.10.4/gtk/__init__.py	2007-11-27 19:28:22.000000000 -0300
+@@ -78,7 +78,8 @@
+ 
+ keysyms = LazyModule('keysyms', locals())
+ 
+-_init()
++if not hasattr(sys.modules['__main__'], 'python_launcher_enabled'):
++    init()
+ 
+ # CAPI
+ _PyGtk_API = _gtk._PyGtk_API
diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
index 57dc48aa77..645aad11e0 100644
--- a/packages/python/python-pygtk_2.10.4.bb
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -6,10 +6,11 @@ RDEPENDS = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "ml6"
+PR = "ml7"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
            file://fix-gtkunixprint.patch;patch=1 \
+           file://prevent_to_get_display_during_import.patch;patch=1 \
            file://nodocs.patch;patch=1 \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pysqlite2_2.4.0.bb b/packages/python/python-pysqlite2_2.4.0.bb
index 751122e10e..50adcba006 100644
--- a/packages/python/python-pysqlite2_2.4.0.bb
+++ b/packages/python/python-pysqlite2_2.4.0.bb
@@ -4,9 +4,10 @@ PRIORITY = "optional"
 LICENSE = "BSD"
 DEPENDS = "sqlite3"
 SRCNAME = "pysqlite"
+PR = "ml1"
 
 SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.4/${PV}/${SRCNAME}-${PV}.tar.gz \
-	   file://fix-setup.patch;patch=1"
+           file://fix-setup.patch;patch=1"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
@@ -15,3 +16,17 @@ do_install_append() {
     install -d ${D}${datadir}/doc/
     mv ${D}${datadir}/pysqlite2-doc ${D}${datadir}/doc/${PN}
 }
+
+RDEPENDS = "\
+ python-datetime \
+ python-lang \
+ python-crypt \
+ python-io \
+ python-threading \
+ python-unittest \
+ python-zlib \
+"
+
+PACKAGES =+ "${PN}-tests"
+FILES_${PN}-tests = "${libdir}/${PYTHON_DIR}/pysqlite2/test"
+RDEPENDS_${PN}-tests = "${PN}"
diff --git a/packages/python/python-sqlobject_0.9.1.bb b/packages/python/python-sqlobject_0.9.1.bb
index db8dfd4aff..90c88a4650 100644
--- a/packages/python/python-sqlobject_0.9.1.bb
+++ b/packages/python/python-sqlobject_0.9.1.bb
@@ -7,9 +7,9 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 RDEPENDS = "python-formencode"
 SRCNAME = "SQLObject"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-inherit distutils
+inherit setuptools
diff --git a/packages/python/python-twisted-2.5.0/.mtn2git_empty b/packages/python/python-twisted-2.5.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-twisted-2.5.0/.mtn2git_empty
diff --git a/packages/twisted/twisted-2.5.0/remove-zope-check.patch b/packages/python/python-twisted-2.5.0/remove-zope-check.patch
index 2bd1b191da..2bd1b191da 100644
--- a/packages/twisted/twisted-2.5.0/remove-zope-check.patch
+++ b/packages/python/python-twisted-2.5.0/remove-zope-check.patch
diff --git a/packages/python/python-twisted_2.5.0.bb b/packages/python/python-twisted_2.5.0.bb
new file mode 100644
index 0000000000..e085e81eb6
--- /dev/null
+++ b/packages/python/python-twisted_2.5.0.bb
@@ -0,0 +1,183 @@
+DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \
+Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols                   \
+(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more."
+HOMEPAGE = "http://www.twistedmatrix.com"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+PR = "r7"
+
+SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/Twisted-${PV}.tar.bz2 \
+           file://remove-zope-check.patch;patch=1"
+
+S = "${WORKDIR}/Twisted-${PV}"
+
+inherit distutils
+
+PACKAGES += "python-twisted-zsh python-twisted-test python-twisted-protocols \
+             python-twisted-runner-dbg \
+             python-twisted-bin  python-twisted-conch python-twisted-lore \
+             python-twisted-mail python-twisted-names python-twisted-news python-twisted-runner \
+             python-twisted-web  python-twisted-words python-twisted python-twisted-core \
+             "
+
+RDEPENDS = "python-core python-zopeinterface"
+RDEPENDS_python-twisted += "python-twisted-bin python-twisted-conch python-twisted-core \
+                            python-twisted-lore python-twisted-mail python-twisted-names \
+                            python-twisted-news python-twisted-runner python-twisted-web \
+                            python-twisted-words"
+
+
+ALLOW_EMPTY = "1"
+FILES_${PN} = ""
+FILES_python-twisted = ""
+
+FILES_python-twisted-test = " \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/web/test \
+"
+
+FILES_python-twisted-protocols = " \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/protocols/ \
+"
+
+FILES_python-twisted-zsh = " \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \
+"
+
+FILES_python-twisted-bin = " \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/_c_urlarg.so \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/cBanana.so \
+"
+
+FILES_python-twisted-conch = " \
+  ${bindir}/ckeygen \
+  ${bindir}/tkconch \
+  ${bindir}/conch \
+  ${bindir}/conchftp \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch  \
+"
+
+FILES_python-twisted-core = " \
+${bindir}/manhole \
+${bindir}/mktap \
+${bindir}/twistd \
+${bindir}/tap2deb \
+${bindir}/tap2rpm \
+${bindir}/tapconvert \
+${bindir}/tkmktap \
+${bindir}/trial \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/dropin.cache \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/application \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/cred \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/enterprise \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/internet \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols\
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python\
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/tap/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugin.py \
+"
+
+FILES_python-twisted-lore = " \
+${bindir}/bookify \
+${bindir}/lore \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_lore.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/lore \
+"
+
+FILES_python-twisted-mail = " \
+${bindir}/mailmail \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/mail \
+"
+
+FILES_python-twisted-names = " \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/names \
+"
+
+FILES_python-twisted-news = " \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/news \
+"
+
+FILES_python-twisted-runner = " \
+${libdir}/site-packages/twisted/runner/portmap.so \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/runner\
+"
+
+FILES_python-twisted-web = " \
+${bindir}/websetroot \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/web\
+"
+
+FILES_python-twisted-words = " \
+${bindir}/im \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/words\
+"
+
+FILES_python-twisted-runner-dbg += " \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/runner/.debug"
+
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index e4a185dde8..de6e5dfaf2 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -87,7 +87,7 @@ RDEPENDS = "\
 		python-webpy		\
 		moin			\
 		plone			\
-		twisted			\
+		python-twisted			\
 		zope"
 
 BROKEN_PACKAGES = "\
diff --git a/packages/twisted/twisted_2.5.0.bb b/packages/twisted/twisted_2.5.0.bb
deleted file mode 100644
index 774deb9c22..0000000000
--- a/packages/twisted/twisted_2.5.0.bb
+++ /dev/null
@@ -1,180 +0,0 @@
-DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \
-Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols                   \
-(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more."
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-RDEPENDS = "python-core python-zopeinterface"
-RDEPENDS_python-twisted += "python-twisted-bin python-twisted-conch python-twisted-core \
-                            python-twisted-lore python-twisted-mail python-twisted-names \
-                            python-twisted-news python-twisted-runner python-twisted-web \
-                            python-twisted-words"
-PR = "r6"
-
-SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/Twisted-${PV}.tar.bz2 \
-           file://remove-zope-check.patch;patch=1"
-
-S = "${WORKDIR}/Twisted-${PV}"
-
-inherit distutils
-
-PACKAGES += "python-twisted-zsh python-twisted-test python-twisted-protocols \
-	     python-twisted-runner-dbg \
-             python-twisted-bin  python-twisted-conch python-twisted-lore \
-             python-twisted-mail python-twisted-names python-twisted-news python-twisted-runner \
-             python-twisted-web  python-twisted-words python-twisted python-twisted-core \
-             "
-
-ALLOW_EMPTY = "1"
-FILES_${PN} = ""
-FILES_python-twisted = ""
-
-FILES_python-twisted-test = " \
-${libdir}/python2.4/site-packages/twisted/python/web/test \
-"
-
-FILES_python-twisted-protocols = " \
-${libdir}/python2.4/site-packages/twisted/python/protocols/ \
-"
-
-FILES_python-twisted-zsh = " \
-${libdir}/python2.4/site-packages/twisted/python/zsh \
-${libdir}/python2.4/site-packages/twisted/python/zshcomp.* \
-"
-
-FILES_python-twisted-bin = " \
-${libdir}/python2.4/site-packages/twisted/protocols/_c_urlarg.so \
-${libdir}/python2.4/site-packages/twisted/spread/cBanana.so"
-
-FILES_python-twisted-conch = " \
-${bindir}/ckeygen \
-${bindir}/tkconch \
-${bindir}/conch \
-${bindir}/conchftp \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_conch.py \
-${libdir}/python2.4/site-packages/twisted/conch  \
-"
-
-FILES_python-twisted-core = " \
-${bindir}/manhole \
-${bindir}/mktap \
-${bindir}/twistd \
-${bindir}/tap2deb \
-${bindir}/tap2rpm \
-${bindir}/tapconvert \
-${bindir}/tkmktap \
-${bindir}/trial \
-${libdir}/python2.4/site-packages/twisted/*.py \
-${libdir}/python2.4/site-packages/twisted/plugins/__init__.py \
-${libdir}/python2.4/site-packages/twisted/plugins/notestplugin.py \
-${libdir}/python2.4/site-packages/twisted/plugins/testplugin.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_ftp.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_inet.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_manhole.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_portforward.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_socks.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_telnet.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_trial.py \
-${libdir}/python2.4/site-packages/twisted/plugins/dropin.cache \
-${libdir}/python2.4/site-packages/twisted/application \
-${libdir}/python2.4/site-packages/twisted/cred \
-${libdir}/python2.4/site-packages/twisted/enterprise \
-${libdir}/python2.4/site-packages/twisted/internet \
-${libdir}/python2.4/site-packages/twisted/manhole \
-${libdir}/python2.4/site-packages/twisted/manhole \
-${libdir}/python2.4/site-packages/twisted/persisted \
-${libdir}/python2.4/site-packages/twisted/protocols\
-${libdir}/python2.4/site-packages/twisted/python\
-${libdir}/python2.4/site-packages/twisted/python/timeoutqueue.py \
-${libdir}/python2.4/site-packages/twisted/python/filepath.py \
-${libdir}/python2.4/site-packages/twisted/python/dxprofile.py \
-${libdir}/python2.4/site-packages/twisted/python/plugin.py \
-${libdir}/python2.4/site-packages/twisted/python/htmlizer.py \
-${libdir}/python2.4/site-packages/twisted/python/__init__.py \
-${libdir}/python2.4/site-packages/twisted/python/dispatch.py \
-${libdir}/python2.4/site-packages/twisted/python/hook.py \
-${libdir}/python2.4/site-packages/twisted/python/threadpool.py \
-${libdir}/python2.4/site-packages/twisted/python/otp.py \
-${libdir}/python2.4/site-packages/twisted/python/usage.py \
-${libdir}/python2.4/site-packages/twisted/python/roots.py \
-${libdir}/python2.4/site-packages/twisted/python/versions.py \
-${libdir}/python2.4/site-packages/twisted/python/urlpath.py \
-${libdir}/python2.4/site-packages/twisted/python/util.py \
-${libdir}/python2.4/site-packages/twisted/python/components.py \
-${libdir}/python2.4/site-packages/twisted/python/logfile.py \
-${libdir}/python2.4/site-packages/twisted/python/runtime.py \
-${libdir}/python2.4/site-packages/twisted/python/reflect.py \
-${libdir}/python2.4/site-packages/twisted/python/context.py \
-${libdir}/python2.4/site-packages/twisted/python/threadable.py \
-${libdir}/python2.4/site-packages/twisted/python/rebuild.py \
-${libdir}/python2.4/site-packages/twisted/python/failure.py \
-${libdir}/python2.4/site-packages/twisted/python/lockfile.py \
-${libdir}/python2.4/site-packages/twisted/python/formmethod.py \
-${libdir}/python2.4/site-packages/twisted/python/finalize.py \
-${libdir}/python2.4/site-packages/twisted/python/win32.py \
-${libdir}/python2.4/site-packages/twisted/python/dist.py \
-${libdir}/python2.4/site-packages/twisted/python/shortcut.py \
-${libdir}/python2.4/site-packages/twisted/python/zipstream.py \
-${libdir}/python2.4/site-packages/twisted/python/release.py \
-${libdir}/python2.4/site-packages/twisted/python/syslog.py \
-${libdir}/python2.4/site-packages/twisted/python/log.py \
-${libdir}/python2.4/site-packages/twisted/python/compat.py \
-${libdir}/python2.4/site-packages/twisted/python/zshcomp.py \
-${libdir}/python2.4/site-packages/twisted/python/procutils.py \
-${libdir}/python2.4/site-packages/twisted/python/text.py \
-${libdir}/python2.4/site-packages/twisted/python/_twisted_zsh_stub \
-${libdir}/python2.4/site-packages/twisted/scripts/ \
-${libdir}/python2.4/site-packages/twisted/spread/ \
-${libdir}/python2.4/site-packages/twisted/tap/ \
-${libdir}/python2.4/site-packages/twisted/trial/ \
-${libdir}/python2.4/site-packages/twisted/__init__.py \
-${libdir}/python2.4/site-packages/twisted/_version.py \
-${libdir}/python2.4/site-packages/twisted/copyright.py \
-${libdir}/python2.4/site-packages/twisted/im.py \
-${libdir}/python2.4/site-packages/twisted/plugin.py \
-"
-
-FILES_python-twisted-lore = " \
-${bindir}/bookify \
-${bindir}/lore \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_lore.py \
-${libdir}/python2.4/site-packages/twisted/lore \
-"
-
-FILES_python-twisted-mail = " \
-${bindir}/mailmail \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_mail.py \
-${libdir}/python2.4/site-packages/twisted/mail \
-"
-
-FILES_python-twisted-names = " \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_names.py \
-${libdir}/python2.4/site-packages/twisted/names \
-"
-
-FILES_python-twisted-news = " \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_news.py \
-${libdir}/python2.4/site-packages/twisted/news \
-"
-
-FILES_python-twisted-runner = " \
-${libdir}python2.4/site-packages/twisted/runner/portmap.so \
-${libdir}/python2.4/site-packages/twisted/runner\
-"
-
-FILES_python-twisted-web = " \
-${bindir}/websetroot \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_web.py \
-${libdir}/python2.4/site-packages/twisted/web\
-"
-
-FILES_python-twisted-words = " \
-${bindir}/im \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_words.py \
-${libdir}/python2.4/site-packages/twisted/words\
-"
-
-FILES_python-twisted-runner-dbg += " \
-${libdir}/python2.4/site-packages/twisted/runner/.debug"
-
author	OpenEmbedded Project <openembedded-devel@lists.openembedded.org>	2008-03-22 11:12:50 +0000
committer	OpenEmbedded Project <openembedded-devel@lists.openembedded.org>	2008-03-22 11:12:50 +0000
commit	8e73e9517a7d9e4c5273cf8c3bf4420ab6adb3e2 (patch)
tree	4f2ccf85f1d7497c5cb3d2ce456db8151d5bdd79
parent	b6ae8ef31690d3a1a829eaa734828075eacc1fd4 (diff)
parent	471667fb417dcf2fa437393690764c187ca29b7e (diff)