# 
# old_revision [fbe3dd342a6d1c2693f57ab699c88225ca434a0f]
# 
# patch "packages/linux/handhelds-pxa-2.6_cvs.bb"
#  from [ac10038417d6d9bc9a8fc0b8c675789b91b55e8a]
#    to [54a65aa4605cff0493635ae1ba4e77fcb0043fad]
# 
============================================================
--- packages/linux/handhelds-pxa-2.6_cvs.bb	ac10038417d6d9bc9a8fc0b8c675789b91b55e8a
+++ packages/linux/handhelds-pxa-2.6_cvs.bb	54a65aa4605cff0493635ae1ba4e77fcb0043fad
@@ -26,7 +26,24 @@
 
 KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}"
 do_configure() {
-	install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No default configuration for ${MACHINE} available."
+        rm -f ${S}/.config
+
+        if [ ! -e ${WORKDIR}/defconfig ]; then
+                die "No default configuration for ${MACHINE} available."
+        fi
+
+        if [ "${TARGET_OS}" == "linux-gnueabi" ]; then
+                echo "CONFIG_AEABI=y"                   >> ${S}/.config
+                echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
+        else
+                echo "# CONFIG_AEABI is not set"        >> ${S}/.config
+                echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
+        fi
+
+        sed -e '/CONFIG_AEABI=/d' \
+            -e '/CONFIG_OABI_COMPAT=/d' \
+            '${WORKDIR}/defconfig' >>'${S}/.config'
+
         yes '' | oe_runmake oldconfig
 }