#
#
# add_file "conf/machine/include/tune-mips2.inc"
#  content [057bacb0584328df3d50b30000597eb1d919767b]
# 
# add_file "packages/libopie/libopie2/remove_h2200_rotate_fix.patch"
#  content [971d8c3bbb6ab648db8f29cf5425c85557416af6]
# 
# add_file "packages/qte/qte-2.3.10/disable-dup-rotation.patch"
#  content [f90a467431d9bde1ffae27ccf563cfdeed54691e]
# 
# patch "conf/machine/rb500.conf"
#  from [c5e4304761ab59c29e7a9549abec25df0455a552]
#    to [ec3468237873c1f6f3831eb19db443d2aba4a9e0]
# 
# patch "conf/machine/wl500g.conf"
#  from [d7067382eb29e1f5c251a2c48f5e4f7d36f6f0f9]
#    to [b7ee5dd752935d7f8924e84976cadbce6359227d]
# 
# patch "conf/machine/wrt54.conf"
#  from [5d9e6710b8fae51d475e91a5c2047e7be52b7649]
#    to [2fe22c13b02b4959e3cab0cc7ff5c98fb68bf489]
# 
# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/control"
#  from [b527265a4a8d5e1b7c8b8ecf77d86a5bd0892b57]
#    to [0c3280f88a76ccf4454f600420c2394625422b57]
# 
# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules"
#  from [fca0385b822b8dc03a597d316d04549edc9dd1be]
#    to [f2b5b27d488e832661562e98cc7249a22c9e29bb]
# 
# patch "packages/tasks/task-opie-16mb.bb"
#  from [17a97e85093fb7c7aaba5ea5de08086d633dc185]
#    to [cf1f25614ad8da263d528b3f34d314213dd05281]
# 
# patch "packages/tasks/task-opie-all.bb"
#  from [247d329aa6a21cecb1f4f74f1a838072b8aa22d8]
#    to [e996923d71e129ec881e2b565c3689d4ce4c94c5]
# 
# patch "packages/tasks/task-opie.bb"
#  from [78fbe261fe8ace945600c95b91627808e02cef52]
#    to [ae01f0abcd042b147b21cd29141a481fd081fdb4]
# 
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [2768d9ecc595b84f45ce4e80e84cf53949a8b652]
#    to [3283df3bb2a36857cc4cb9bd5bd8e5e3c3ea5b35]
#
============================================================
--- conf/machine/include/tune-mips2.inc	057bacb0584328df3d50b30000597eb1d919767b
+++ conf/machine/include/tune-mips2.inc	057bacb0584328df3d50b30000597eb1d919767b
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-mips2"
============================================================
--- packages/libopie/libopie2/remove_h2200_rotate_fix.patch	971d8c3bbb6ab648db8f29cf5425c85557416af6
+++ packages/libopie/libopie2/remove_h2200_rotate_fix.patch	971d8c3bbb6ab648db8f29cf5425c85557416af6
@@ -0,0 +1,15 @@
+--- libopie2/opiecore/device/odevice_ipaq.cpp	25 Jul 2007 10:49:20 -0000	1.32
++++ libopie2/opiecore/device/odevice_ipaq.cpp	17 Mar 2007 22:08:43 -0000	1.30
+@@ -330,12 +330,6 @@
+                 case Rot180: quarters = 1/*270deg*/; break;
+                 case Rot270: quarters = 0/*270deg*/; break;
+             }
+-            if( d->m_model == Model_iPAQ_H22xx ) {
+-              // FIXME: there's something screwed with the keycodes being sent on h2200. I have
+-              // added a temporary workaround for this here, but the bug should be fixed properly
+-              // later in the right place. - Paul Eggleton 25/07/2007
+-              quarters = 0;
+-            }
+             newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4;
+             break;
+         }
============================================================
--- packages/qte/qte-2.3.10/disable-dup-rotation.patch	f90a467431d9bde1ffae27ccf563cfdeed54691e
+++ packages/qte/qte-2.3.10/disable-dup-rotation.patch	f90a467431d9bde1ffae27ccf563cfdeed54691e
@@ -0,0 +1,13 @@
+--- qte/src/kernel/kernelkeyboard.cpp	2008-04-04 11:07:42.000000000 +0100
++++ qte/src/kernel/kernelkeyboard.cpp	2008-04-04 11:07:45.000000000 +0100
+@@ -627,8 +627,8 @@
+     case Qt::Key_Down:
+         unicode = 0xffff;
+         mod_key = false;
+-        if (qt_screen->isTransformed())
+-            qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) );
++//        if (qt_screen->isTransformed())
++//            qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) );
+         break;
+     /*
+      * handle lock, we don't handle scroll lock!
============================================================
--- conf/machine/rb500.conf	c5e4304761ab59c29e7a9549abec25df0455a552
+++ conf/machine/rb500.conf	ec3468237873c1f6f3831eb19db443d2aba4a9e0
@@ -3,5 +3,6 @@ TARGET_ARCH = "mipsel"
 #@DESCRIPTION: Machine configuration for the MIPS based Routerboard
 
 TARGET_ARCH = "mipsel"
-TARGET_CC_ARCH = "-Os -mips2"
 PREFERRED_PROVIDER_virtual/kernel = "linux-rb500"
+
+include conf/machine/include/tune-mips2.inc
============================================================
--- conf/machine/wl500g.conf	d7067382eb29e1f5c251a2c48f5e4f7d36f6f0f9
+++ conf/machine/wl500g.conf	b7ee5dd752935d7f8924e84976cadbce6359227d
@@ -5,4 +5,4 @@ MACHINE_FEATURES = "kernel26 usbhost wif
 TARGET_ARCH = "mipsel"
 MACHINE_FEATURES = "kernel26 usbhost wifi ext2"
 
+include conf/machine/include/mips2.inc
-TARGET_CC_ARCH = "-Os -mips2"
============================================================
--- conf/machine/wrt54.conf	5d9e6710b8fae51d475e91a5c2047e7be52b7649
+++ conf/machine/wrt54.conf	2fe22c13b02b4959e3cab0cc7ff5c98fb68bf489
@@ -3,7 +3,6 @@ TARGET_ARCH = "mipsel"
 #@DESCRIPTION: Machine configuration for the MIPS based WRT54G(S) devices
 
 TARGET_ARCH = "mipsel"
-TARGET_CC_ARCH = "-Os"
 
 SERIAL_CONSOLE = "tts/0"
 
============================================================
--- contrib/distro-packages/debian/openembedded-essential-1.4/debian/control	b527265a4a8d5e1b7c8b8ecf77d86a5bd0892b57
+++ contrib/distro-packages/debian/openembedded-essential-1.4/debian/control	0c3280f88a76ccf4454f600420c2394625422b57
@@ -3,7 +3,7 @@ Build-Depends: debhelper (>= 5)
 Priority: optional
 Maintainer: Marcin Juszkiewicz <hrw@openembedded.org>
 Build-Depends: debhelper (>= 5)
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: openembedded-essential
 Architecture: all
============================================================
--- contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules	fca0385b822b8dc03a597d316d04549edc9dd1be
+++ contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules	f2b5b27d488e832661562e98cc7249a22c9e29bb
@@ -4,6 +4,7 @@ clean:
 binary-arch:
 
 clean:
+	dh_clean
 
 binary-indep:
 	dh_testdir
============================================================
--- packages/tasks/task-opie-16mb.bb	17a97e85093fb7c7aaba5ea5de08086d633dc185
+++ packages/tasks/task-opie-16mb.bb	cf1f25614ad8da263d528b3f34d314213dd05281
@@ -29,7 +29,7 @@ RDEPENDS_task-opie-16mb-applets = "opie-
                                    opie-screenshotapplet \
     ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "apm", "opie-batteryapplet", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-cardapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
 
 PACKAGE_ARCH_task-opie-16mb-applets = "${MACHINE_ARCH}"
============================================================
--- packages/tasks/task-opie-all.bb	247d329aa6a21cecb1f4f74f1a838072b8aa22d8
+++ packages/tasks/task-opie-all.bb	e996923d71e129ec881e2b565c3689d4ce4c94c5
@@ -18,7 +18,7 @@ RDEPENDS_task-opie-applets = "opie-about
                      opie-clipboardapplet opie-clockapplet opie-homeapplet \
                      opie-irdaapplet opie-lockapplet opie-logoutapplet \
                      opie-mailapplet opie-memoryapplet opie-multikeyapplet \
-                     opie-networkapplet opie-notesapplet opie-pcmciaapplet \
+                     opie-networkapplet opie-notesapplet opie-cardapplet \
                      opie-pyquicklaunchapplet opie-restartapplet \
                      opie-restartapplet2 opie-rotateapplet \
                      opie-screenshotapplet opie-suspendapplet opie-vmemo \
============================================================
--- packages/tasks/task-opie.bb	78fbe261fe8ace945600c95b91627808e02cef52
+++ packages/tasks/task-opie.bb	ae01f0abcd042b147b21cd29141a481fd081fdb4
@@ -44,7 +44,7 @@ RDEPENDS_task-opie-base-applets = "opie-
                                    opie-screenshotapplet \
     ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "apm", "opie-batteryapplet", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-cardapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
 
 PACKAGE_ARCH_task-opie-base-applets = "${MACHINE_ARCH}"
============================================================
--- packages/uclibc/uclibc_0.9.29.bb	2768d9ecc595b84f45ce4e80e84cf53949a8b652
+++ packages/uclibc/uclibc_0.9.29.bb	3283df3bb2a36857cc4cb9bd5bd8e5e3c3ea5b35
@@ -7,7 +7,7 @@ UCLIBC_BASE ?= "0.9.29"
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r17"
+PR = "r18"
 
 require uclibc.inc
 
@@ -27,6 +27,7 @@ SRC_URI += "file://uClibc.machine file:/
 	    file://uClibc-0.9.29-rm-whitespace.patch;patch=1 \
             file://uClibc-0.9.29-avr32-bzero.patch;patch=1 \
 	    file://uClibc-0.9.29-nonposix_bashisms.patch;patch=1 \
+            file://arm_fix_alignment.patch;patch=1 \
            "
 
 #recent versions uclibc require real kernel headers