[oe-commits] org.oe.dev merge of '0ce1ec91df499539b43f53a80718a77449b22b6b'

freyther commit openembedded-commits at lists.openembedded.org
Mon Jan 21 00:01:27 UTC 2008


merge of '0ce1ec91df499539b43f53a80718a77449b22b6b'
     and 'f1621de24fc1acbb89be67256867ca01cea8c10d'

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 879e6effd2489aabfe6138e226daa3720fc28790
ViewMTN: http://monotone.openembedded.org/revision/info/879e6effd2489aabfe6138e226daa3720fc28790
Files:
1
packages/qt4/qtopia-core_4.2.0.bb
packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch
packages/qt4/qtopia-core-4.3.3/qconfig-oe.h
packages/qt4/qtopia-core.inc
packages/qt4/qtopia-core_4.3.3.bb
packages/linux/linux-rp-2.6.19+git
packages/linux/linux-rp-2.6.19+git/add-oz-release-string.patch
packages/linux/linux-rp-2.6.19+git/connectplus-remove-ide-HACK.patch
packages/linux/linux-rp-2.6.19+git/defconfig-akita
packages/linux/linux-rp-2.6.19+git/defconfig-c7x0
packages/linux/linux-rp-2.6.19+git/defconfig-collie
packages/linux/linux-rp-2.6.19+git/defconfig-hx2000
packages/linux/linux-rp-2.6.19+git/defconfig-poodle
packages/linux/linux-rp-2.6.19+git/defconfig-qemuarm
packages/linux/linux-rp-2.6.19+git/defconfig-qemux86
packages/linux/linux-rp-2.6.19+git/defconfig-spitz
packages/linux/linux-rp-2.6.19+git/defconfig-tosa
packages/linux/linux-rp-2.6.19+git/hrw-pcmcia-ids-r5.patch
packages/linux/linux-rp-2.6.19+git/pxa-serial-hack.patch
packages/linux/linux-rp-2.6.19+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/linux/linux-rp-2.6.19+git/sharpsl-pm-postresume-r1.patch
packages/linux/linux-rp-2.6.19+git/squashfs3.0-2.6.15.patch
packages/linux/linux-rp-2.6.19+git/tmio-nand-r7.patch
packages/linux/linux-rp-2.6.19+git/tmio-ohci-r6.patch
packages/linux/linux-rp-2.6.19+git/tmio-tc6393-r8.patch
packages/linux/linux-rp-2.6.19+git/tosa-keyboard-r18.patch
packages/linux/linux-rp-2.6.19+git/tosa-lcdnoise-r1.patch
packages/linux/linux-rp-2.6.19+git/tosa-tmio-lcd-r10.patch
packages/linux/linux-rp-2.6.19+git/wm9712-reset-loop-r2.patch
packages/linux/linux-rp-2.6.19+git/wm9712-suspend-cold-res-r2.patch
packages/linux/linux-rp-2.6.19+git/wm97xx-lcdnoise-r0.patch
packages/linux/linux-rp-2.6.20
packages/linux/linux-rp-2.6.20/add-oz-release-string.patch
packages/linux/linux-rp-2.6.20/connectplus-remove-ide-HACK.patch
packages/linux/linux-rp-2.6.20/defconfig-akita
packages/linux/linux-rp-2.6.20/defconfig-c7x0
packages/linux/linux-rp-2.6.20/defconfig-collie
packages/linux/linux-rp-2.6.20/defconfig-hx2000
packages/linux/linux-rp-2.6.20/defconfig-poodle
packages/linux/linux-rp-2.6.20/defconfig-qemuarm
packages/linux/linux-rp-2.6.20/defconfig-qemux86
packages/linux/linux-rp-2.6.20/defconfig-spitz
packages/linux/linux-rp-2.6.20/defconfig-spitz.flash
packages/linux/linux-rp-2.6.20/defconfig-tosa
packages/linux/linux-rp-2.6.20/hostap-monitor-mode.patch
packages/linux/linux-rp-2.6.20/orinoco-remove-all-which-are-in-hostap-HACK.patch
packages/linux/linux-rp-2.6.20/pxa-serial-hack.patch
packages/linux/linux-rp-2.6.20/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch
packages/linux/linux-rp-2.6.20/squashfs3.0-2.6.15.patch
packages/linux/linux-rp-2.6.20/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
packages/linux/linux-rp-2.6.20/wm97xx-lcdnoise-r0.patch
packages/linux/linux-rp-2.6.22
packages/linux/linux-rp-2.6.22/connectplus-remove-ide-HACK.patch
packages/linux/linux-rp-2.6.22/defconfig-akita
packages/linux/linux-rp-2.6.22/defconfig-bootcdx86
packages/linux/linux-rp-2.6.22/defconfig-c7x0
packages/linux/linux-rp-2.6.22/defconfig-collie
packages/linux/linux-rp-2.6.22/defconfig-htcuniversal
packages/linux/linux-rp-2.6.22/defconfig-hx2000
packages/linux/linux-rp-2.6.22/defconfig-poodle
packages/linux/linux-rp-2.6.22/defconfig-qemuarm
packages/linux/linux-rp-2.6.22/defconfig-qemux86
packages/linux/linux-rp-2.6.22/defconfig-spitz
packages/linux/linux-rp-2.6.22/defconfig-tosa
packages/linux/linux-rp-2.6.22/hostap-monitor-mode.patch
packages/linux/linux-rp-2.6.22/htcuni-acx.patch
packages/linux/linux-rp-2.6.22/htcuni.patch
packages/linux/linux-rp-2.6.22/pda-power.patch
packages/linux/linux-rp-2.6.22/pxa-serial-hack.patch
packages/linux/linux-rp-2.6.22/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/linux/linux-rp-2.6.22/sharpsl-pm-postresume-r1.patch
packages/linux/linux-rp-2.6.22/squashfs3.0-2.6.15.patch
packages/linux/linux-rp-2.6.22/tmio-fb-r6-fix-r0.patch
packages/linux/linux-rp-2.6.22/tmio-nand-r8.patch
packages/linux/linux-rp-2.6.22/tmio-ohci-r6.patch
packages/linux/linux-rp-2.6.22/tmio-tc6393-r8.patch
packages/linux/linux-rp-2.6.22/tosa-keyboard-r19.patch
packages/linux/linux-rp-2.6.22/tosa-lcdnoise-r1-fix-r0.patch
packages/linux/linux-rp-2.6.22/tosa-lcdnoise-r1.patch
packages/linux/linux-rp-2.6.22/tosa-power-r18-fix-r0.patch
packages/linux/linux-rp-2.6.22/tosa-pxaac97-r6-fix-r0.patch
packages/linux/linux-rp-2.6.22/tosa-tmio-lcd-r10-fix-r0.patch
packages/linux/linux-rp-2.6.22/tosa-tmio-lcd-r10.patch
packages/linux/linux-rp-2.6.22/usb-ohci-hooks-r2.patch
packages/linux/linux-rp-2.6.22/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
packages/linux/linux-rp-2.6.22/wm9712-reset-loop-r2.patch
packages/linux/linux-rp-2.6.22/wm9712-suspend-cold-res-r2.patch
packages/linux/linux-rp-2.6.22/wm97xx-lg13-r0-fix-r0.patch
packages/linux/linux-rp-2.6.22/wm97xx-lg13-r0.patch
packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch
packages/linux/linux-rp-2.6.23/pda-power.patch
packages/linux/linux-rp-2.6.23/vt_ioctl_race.patch
packages/linux/linux-rp-2.6.23/w100fb-unused-var.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/hx2750_base-r31.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/mmcsd_no_scr_check-r2.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/pda-power.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/pxa27x_overlay-r8.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/squashfs3.0-2.6.15.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/squashfs3.2-2.6.20-r0.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/uvesafb-0.1-rc3-2.6.22.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/vt_ioctl_race.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/w100fb-unused-var.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/wm97xx-lcdnoise-r0.patch
packages/linux/linux-rp_2.6.19+git.bb
packages/linux/linux-rp_2.6.20.bb
packages/linux/linux-rp_2.6.22.bb
packages/altboot/altboot_1.1.1+wip-SVNR73.bb
packages/altboot/altboot_1.1.1+wip-SVNR77.bb
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git
packages/linux/linux-rp-2.6.23+2.6.24-rc8
packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb
packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb
packages/freesmartphone/python-fso-pyproto_svn.bb
packages/linux/linux-rp-2.6.23/versatile-armv6.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc8/connectplus-prevent-oops-HACK.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc8/squashfs3.3.patch
conf/distro/include/sane-srcrevs.inc
conf/machine/chumby.conf
packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
packages/linux/linux-rp-2.6.23/defconfig-akita
packages/linux/linux-rp-2.6.23/defconfig-bootcdx86
packages/linux/linux-rp-2.6.23/defconfig-c7x0
packages/linux/linux-rp-2.6.23/defconfig-collie
packages/linux/linux-rp-2.6.23/defconfig-htcuniversal
packages/linux/linux-rp-2.6.23/defconfig-hx2000
packages/linux/linux-rp-2.6.23/defconfig-poodle
packages/linux/linux-rp-2.6.23/defconfig-qemuarm
packages/linux/linux-rp-2.6.23/defconfig-qemux86
packages/linux/linux-rp-2.6.23/defconfig-spitz
packages/linux/linux-rp-2.6.23/defconfig-tosa
packages/linux/linux-rp-2.6.23/defconfig-zylonite
packages/linux/linux-rp_2.6.23.bb
packages/rt2x00/rt73-k2wrlz_1.0.0.bb
packages/rt2x00/rt73-k2wrlz_2.0.1.bb
packages/spandsp/spandsp_0.0.3.bb
packages/tasks/task-openmoko-ui.bb
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
Diffs:

#
# mt diff -r0ce1ec91df499539b43f53a80718a77449b22b6b -r879e6effd2489aabfe6138e226daa3720fc28790
#
# 
# 
# delete "packages/qt4/qtopia-core_4.2.0.bb"
# 
# add_file "packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch"
#  content [c3b316fee55e5f2f5eecd54f37cdc88af92b9956]
# 
# add_file "packages/qt4/qtopia-core-4.3.3/qconfig-oe.h"
#  content [b03c0cf1186234b787173c4ebb4d6ee12103b1b6]
# 
# patch "packages/qt4/qtopia-core.inc"
#  from [afdef9632312a739952146a0359c30d1fc64c12f]
#    to [3fc8e29466adb68cfe7d5609ee964d7ba4951bbe]
# 
# patch "packages/qt4/qtopia-core_4.3.3.bb"
#  from [9272f8ac29a03d2b11a73f4636b20468b3c281ec]
#    to [3e76409cf2b8fa339a9084bfc41b1a6714e46b88]
# 
============================================================
--- packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch	c3b316fee55e5f2f5eecd54f37cdc88af92b9956
+++ packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch	c3b316fee55e5f2f5eecd54f37cdc88af92b9956
@@ -0,0 +1,62 @@
+Index: qtopia-core-opensource-src-4.3.3/configure
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/configure	2008-01-20 11:42:07.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/configure	2008-01-20 22:31:37.000000000 +0100
+@@ -639,10 +639,10 @@
+ 
+ CFG_SQL_AVAILABLE=
+ if [ -d "$relpath/src/plugins/sqldrivers" ]; then
+-  for a in "$relpath/src/plugins/sqldrivers/"*; do
+-     if [ -d "$a" ]; then
+-	 base_a=`basename $a`
+-  	 CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${base_a}"
++  for a in `ls $relpath/src/plugins/sqldrivers/`; do
++     dir="$relpath/src/plugins/sqldrivers/$a"
++     if [ -d "$dir" ]; then
++  	 CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${a}"
+ 	 eval "CFG_SQL_${base_a}=auto"
+      fi
+   done
+@@ -650,30 +650,30 @@
+ 
+ CFG_DECORATION_PLUGIN_AVAILABLE=
+ if [ -d "$relpath/src/plugins/decorations" ]; then
+-  for a in "$relpath/src/plugins/decorations/"*; do
+-     if [ -d "$a" ]; then
+-	 base_a=`basename $a`
+-  	 CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${base_a}"
++  for a in `ls $relpath/src/plugins/decorations/`; do
++     dir="$relpath/src/plugins/decorations/$a"
++     if [ -d "$dir" ]; then
++  	 CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${a}"
+      fi
+   done
+ fi
+ 
+ CFG_MOUSE_PLUGIN_AVAILABLE=
+ if [ -d "$relpath/src/plugins/mousedrivers" ]; then
+-  for a in "$relpath/src/plugins/mousedrivers/"*; do
+-     if [ -d "$a" ]; then
+-	 base_a=`basename $a`
+-  	 CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${base_a}"
++  for a in `ls $relpath/src/plugins/mousedrivers/`; do
++     dir="$relpath/src/plugins/mousedrivers/$a"
++     if [ -d "$dir" ]; then
++  	 CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${a}"
+      fi
+   done
+ fi
+ 
+ CFG_GFX_PLUGIN_AVAILABLE=
+ if [ -d "$relpath/src/plugins/gfxdrivers" ]; then
+-  for a in "$relpath/src/plugins/gfxdrivers/"*; do
+-     if [ -d "$a" ]; then
+-	 base_a=`basename $a`
+-  	 CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${base_a}"
++  for a in `ls $relpath/src/plugins/gfxdrivers/`; do
++     dir="$relpath/src/plugins/gfxdrivers/$a"
++     if [ -d "$dir" ]; then
++  	 CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${a}"
+      fi
+   done
+   CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off
============================================================
--- packages/qt4/qtopia-core-4.3.3/qconfig-oe.h	b03c0cf1186234b787173c4ebb4d6ee12103b1b6
+++ packages/qt4/qtopia-core-4.3.3/qconfig-oe.h	b03c0cf1186234b787173c4ebb4d6ee12103b1b6
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 1992-2007 Trolltech ASA. All rights reserved.
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/
+**
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales at trolltech.com.
+**
+** In addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.0, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** In addition, as a special exception, Trolltech, as the sole copyright
+** holder for Qt Designer, grants users of the Qt/Eclipse Integration
+** plug-in the right for the Qt/Eclipse Integration to link to
+** functionality provided by Qt Designer and its related libraries.
+**
+** Trolltech reserves all rights not expressly granted herein.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+
+/*
+ Empty leaves all features enabled. See doc/html/emb-features.html for choices.
+
+ Note that disabling some features will produce a libqt that is not
+ compatible with other libqt builds. Such modifications are only
+ supported on Qtopia Core where reducing the library size is important
+ and where the application-suite is often a fixed set.
+*/
============================================================
--- packages/qt4/qtopia-core.inc	afdef9632312a739952146a0359c30d1fc64c12f
+++ packages/qt4/qtopia-core.inc	3fc8e29466adb68cfe7d5609ee964d7ba4951bbe
@@ -7,6 +7,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/so
 PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
+           file://qconfig-oe.h \
            file://0001-cross-compile.patch;patch=1 \
            file://0003-no-tools.patch;patch=1 \
            file://0004-no-qmake.patch;patch=1 \
@@ -17,7 +18,19 @@ QT_CONFIG_FLAGS += " \
 
 QT_CONFIG_FLAGS += " \
     -nomake demos -nomake examples -nomake tools -qtlibinfix E\
-    -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}"
+    -embedded ${QT_ARCH} \
+    -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \
+    -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc\
+    -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb\
+    -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb\
+    ${QT_QCONFIG} \
+    "
+
+do_configure_prepend() {
+    cp ${WORKDIR}/qconfig-oe.h ${S}/src/corelib/global
+}
+
+QT_QCONFIG = ""
 QT_BASE_NAME = "qtopiacore"
 QT_BASE_LIB  = "libqtopiacore"
 QT_DIR_NAME = "qtopia"
============================================================
--- packages/qt4/qtopia-core_4.3.3.bb	9272f8ac29a03d2b11a73f4636b20468b3c281ec
+++ packages/qt4/qtopia-core_4.3.3.bb	3e76409cf2b8fa339a9084bfc41b1a6714e46b88
@@ -1,5 +1,6 @@ SRC_URI += " \
 require qtopia-core.inc
 SRC_URI += " \
            file://0006-freetype-host-includes.patch;patch=1 \
            file://0007-openssl-host-includes.patch;patch=1 \
+           file://0008-backport-qt-lib-infix.patch;patch=1 \
+           file://allow-configure-plugins.patch;patch=1 "
-           file://0008-backport-qt-lib-infix.patch;patch=1"


#
# mt diff -rf1621de24fc1acbb89be67256867ca01cea8c10d -r879e6effd2489aabfe6138e226daa3720fc28790
#
# 
# 
# delete "packages/linux/linux-rp-2.6.19+git"
# 
# delete "packages/linux/linux-rp-2.6.19+git/add-oz-release-string.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/connectplus-remove-ide-HACK.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/defconfig-akita"
# 
# delete "packages/linux/linux-rp-2.6.19+git/defconfig-c7x0"
# 
# delete "packages/linux/linux-rp-2.6.19+git/defconfig-collie"
# 
# delete "packages/linux/linux-rp-2.6.19+git/defconfig-hx2000"
# 
# delete "packages/linux/linux-rp-2.6.19+git/defconfig-poodle"
# 
# delete "packages/linux/linux-rp-2.6.19+git/defconfig-qemuarm"
# 
# delete "packages/linux/linux-rp-2.6.19+git/defconfig-qemux86"
# 
# delete "packages/linux/linux-rp-2.6.19+git/defconfig-spitz"
# 
# delete "packages/linux/linux-rp-2.6.19+git/defconfig-tosa"
# 
# delete "packages/linux/linux-rp-2.6.19+git/hrw-pcmcia-ids-r5.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/pxa-serial-hack.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/sharpsl-pm-postresume-r1.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/squashfs3.0-2.6.15.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/tmio-nand-r7.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/tmio-ohci-r6.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/tmio-tc6393-r8.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/tosa-keyboard-r18.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/tosa-lcdnoise-r1.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/tosa-tmio-lcd-r10.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/wm9712-reset-loop-r2.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/wm9712-suspend-cold-res-r2.patch"
# 
# delete "packages/linux/linux-rp-2.6.19+git/wm97xx-lcdnoise-r0.patch"
# 
# delete "packages/linux/linux-rp-2.6.20"
# 
# delete "packages/linux/linux-rp-2.6.20/add-oz-release-string.patch"
# 
# delete "packages/linux/linux-rp-2.6.20/connectplus-remove-ide-HACK.patch"
# 
# delete "packages/linux/linux-rp-2.6.20/defconfig-akita"
# 
# delete "packages/linux/linux-rp-2.6.20/defconfig-c7x0"
# 
# delete "packages/linux/linux-rp-2.6.20/defconfig-collie"
# 
# delete "packages/linux/linux-rp-2.6.20/defconfig-hx2000"
# 
# delete "packages/linux/linux-rp-2.6.20/defconfig-poodle"
# 
# delete "packages/linux/linux-rp-2.6.20/defconfig-qemuarm"
# 
# delete "packages/linux/linux-rp-2.6.20/defconfig-qemux86"
# 
# delete "packages/linux/linux-rp-2.6.20/defconfig-spitz"
# 
# delete "packages/linux/linux-rp-2.6.20/defconfig-spitz.flash"
# 
# delete "packages/linux/linux-rp-2.6.20/defconfig-tosa"
# 
# delete "packages/linux/linux-rp-2.6.20/hostap-monitor-mode.patch"
# 
# delete "packages/linux/linux-rp-2.6.20/orinoco-remove-all-which-are-in-hostap-HACK.patch"
# 
# delete "packages/linux/linux-rp-2.6.20/pxa-serial-hack.patch"
# 
# delete "packages/linux/linux-rp-2.6.20/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
# 
# delete "packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch"
# 
# delete "packages/linux/linux-rp-2.6.20/squashfs3.0-2.6.15.patch"
# 
# delete "packages/linux/linux-rp-2.6.20/vesafb-tng-1.0-rc2-2.6.20-rc2.patch"
# 
# delete "packages/linux/linux-rp-2.6.20/wm97xx-lcdnoise-r0.patch"
# 
# delete "packages/linux/linux-rp-2.6.22"
# 
# delete "packages/linux/linux-rp-2.6.22/connectplus-remove-ide-HACK.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/defconfig-akita"
# 
# delete "packages/linux/linux-rp-2.6.22/defconfig-bootcdx86"
# 
# delete "packages/linux/linux-rp-2.6.22/defconfig-c7x0"
# 
# delete "packages/linux/linux-rp-2.6.22/defconfig-collie"
# 
# delete "packages/linux/linux-rp-2.6.22/defconfig-htcuniversal"
# 
# delete "packages/linux/linux-rp-2.6.22/defconfig-hx2000"
# 
# delete "packages/linux/linux-rp-2.6.22/defconfig-poodle"
# 
# delete "packages/linux/linux-rp-2.6.22/defconfig-qemuarm"
# 
# delete "packages/linux/linux-rp-2.6.22/defconfig-qemux86"
# 
# delete "packages/linux/linux-rp-2.6.22/defconfig-spitz"
# 
# delete "packages/linux/linux-rp-2.6.22/defconfig-tosa"
# 
# delete "packages/linux/linux-rp-2.6.22/hostap-monitor-mode.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/htcuni-acx.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/htcuni.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/pda-power.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/pxa-serial-hack.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/sharpsl-pm-postresume-r1.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/squashfs3.0-2.6.15.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/tmio-fb-r6-fix-r0.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/tmio-nand-r8.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/tmio-ohci-r6.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/tmio-tc6393-r8.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/tosa-keyboard-r19.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/tosa-lcdnoise-r1-fix-r0.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/tosa-lcdnoise-r1.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/tosa-power-r18-fix-r0.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/tosa-pxaac97-r6-fix-r0.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/tosa-tmio-lcd-r10-fix-r0.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/tosa-tmio-lcd-r10.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/usb-ohci-hooks-r2.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/vesafb-tng-1.0-rc2-2.6.20-rc2.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/wm9712-reset-loop-r2.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/wm9712-suspend-cold-res-r2.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/wm97xx-lg13-r0-fix-r0.patch"
# 
# delete "packages/linux/linux-rp-2.6.22/wm97xx-lg13-r0.patch"
# 
# delete "packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch"
# 
# delete "packages/linux/linux-rp-2.6.23/pda-power.patch"
# 
# delete "packages/linux/linux-rp-2.6.23/vt_ioctl_race.patch"
# 
# delete "packages/linux/linux-rp-2.6.23/w100fb-unused-var.patch"
# 
# delete "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/hx2750_base-r31.patch"
# 
# delete "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/mmcsd_no_scr_check-r2.patch"
# 
# delete "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/pda-power.patch"
# 
# delete "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/pxa27x_overlay-r8.patch"
# 
# delete "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/squashfs3.0-2.6.15.patch"
# 
# delete "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/squashfs3.2-2.6.20-r0.patch"
# 
# delete "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/uvesafb-0.1-rc3-2.6.22.patch"
# 
# delete "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/vt_ioctl_race.patch"
# 
# delete "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/w100fb-unused-var.patch"
# 
# delete "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/wm97xx-lcdnoise-r0.patch"
# 
# delete "packages/linux/linux-rp_2.6.19+git.bb"
# 
# delete "packages/linux/linux-rp_2.6.20.bb"
# 
# delete "packages/linux/linux-rp_2.6.22.bb"
# 
# rename "packages/altboot/altboot_1.1.1+wip-SVNR73.bb"
#     to "packages/altboot/altboot_1.1.1+wip-SVNR77.bb"
# 
# rename "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git"
#     to "packages/linux/linux-rp-2.6.23+2.6.24-rc8"
# 
# rename "packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb"
#     to "packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb"
# 
# add_file "packages/freesmartphone/python-fso-pyproto_svn.bb"
#  content [aa9edc619b06b6207bba7152bbd39b99c8500be9]
# 
# add_file "packages/linux/linux-rp-2.6.23/versatile-armv6.patch"
#  content [4741cf31febeef15c0b7646588b288c097a3d14c]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc8/connectplus-prevent-oops-HACK.patch"
#  content [e7f07c5193600ba480642fd62dcae173b6b62189]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc8/squashfs3.3.patch"
#  content [3c2c3d66d9c2e306b9af229c447163389280ca3f]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [d560814623625b6b57fc9aad038a6e4e6b62f271]
#    to [6ef46c8b95f24943ca5e5328f0762853a00c8775]
# 
# patch "conf/machine/chumby.conf"
#  from [3d7a9c183a4567571b4914f1a614545e5029b69c]
#    to [7cbd912e26977611a7854f15cdb0430634bbb15c]
# 
# patch "packages/altboot/altboot_1.1.1+wip-SVNR77.bb"
#  from [96164c033b2c0fe28e30604b817aa4dfddcaae1d]
#    to [2e034d5c253a97df078a6cb997155f41b343bac3]
# 
# patch "packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb"
#  from [11545265005ad661949a73715ea36b89f4bd6235]
#    to [c69fc96ff44816e3fc820615958ba3dccda29119]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-akita"
#  from [e4ed8aa2e8093b76623a986e828f10bcc2ee9a67]
#    to [16a4bad602abd5690f33cd43e92712d80da502a1]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-bootcdx86"
#  from [ad21acaef2a04655c65928c765b511e82a59ee04]
#    to [8aad1b0a4a185ddc9292e346428524a65026d738]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-c7x0"
#  from [dc7dade2dad1f3057a7bb05ff620280d43d30cc2]
#    to [f68786d19f1fee76d589788b501bbf1a71799f57]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-collie"
#  from [4b6d1891ba1feafa723b5a6a989e8a5180fd7fb0]
#    to [e95ab6574994fe324edea401b8406b675ab56357]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-htcuniversal"
#  from [e45c9a16da1338ba1c0c3729abb87c3bca1b6b28]
#    to [1340c6d9391cb6733576e09c22f804d9a619c70e]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-hx2000"
#  from [1b13cda49ede5d8836faa57b966228223fb3aa26]
#    to [7c95cdcb3e9a0338ccfa0e9fa3b11478db8db5b9]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-poodle"
#  from [d11e4161fb755938b4e6bae34a26fbc99e3c8005]
#    to [542bb67edbec944a39852833936a90dd679f8f4d]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-qemuarm"
#  from [564e3f07d9b3c03a7619acf54c7187f006914a14]
#    to [4125a6a73ab2e74f0b332baa32d064f0121314b4]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-qemux86"
#  from [8ccc6e58e0e31b1ddedc5815a07efdb9b8275b77]
#    to [785a6d7062c8b72ecccf59c182ad2eb1fbfa72bd]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-spitz"
#  from [8da33288c31edb805f711542d6475c386630f1f6]
#    to [b7ae462871d969fb588349aa16c4991646c4ff65]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-tosa"
#  from [1980d93e930a1fd5959d13384211a7f445751136]
#    to [8d1c6cbc73160dcaf3a3bbb8a1b4a3ff0dc5f1c5]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-zylonite"
#  from [e17aaae412fbee7e7d1ee5a63f6d5e9a14bb3cfa]
#    to [f58d5f10cee5e4ad18945fd7d595ccfc26a2b8b5]
# 
# patch "packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb"
#  from [bc12e1d906e1b92a01c582c78b78b98683f01099]
#    to [dddd1b2aba27480ec53022fce6ce6a6802552530]
# 
# patch "packages/linux/linux-rp_2.6.23.bb"
#  from [7ed3a000ed87924d72bda9c03a39fe938b38f7db]
#    to [859f03b96da909344eeea42ccccd31eb657a0f26]
# 
# patch "packages/rt2x00/rt73-k2wrlz_1.0.0.bb"
#  from [e5d2200434ee3d7d544b4b76220f2f981219e608]
#    to [6e3d56798d7cbb66593704a21b1b9ceebd6e1c8e]
# 
# patch "packages/rt2x00/rt73-k2wrlz_2.0.1.bb"
#  from [94c5ade405abb7ff66b4e2d6453b847385e0e177]
#    to [57b4bba40f82c56f55dcbf828353f7fa5cb5c68a]
# 
# patch "packages/spandsp/spandsp_0.0.3.bb"
#  from [9b248bfa60d8847873395df1ae5b309eecaaf91f]
#    to [eabce9404047737c74f5e7710878f500f27fc5b3]
# 
# patch "packages/tasks/task-openmoko-ui.bb"
#  from [bb6b9730c10ac671b39ef678698134fcbf9e7a05]
#    to [2ecbd1e8e6fb61f036cdc71551e7b835108d589c]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
#  from [684d183b9b73eecbbdb15dc21ff863ae212a9e98]
#    to [2915a14313602fff89685477aaabe69d4e32a457]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
#  from [6578acd7668e306b7372e0e3aebfb95d49fa7961]
#    to [340d573b1a5fe3425baaf5aaff65d592981fb315]
# 
============================================================
--- packages/freesmartphone/python-fso-pyproto_svn.bb	aa9edc619b06b6207bba7152bbd39b99c8500be9
+++ packages/freesmartphone/python-fso-pyproto_svn.bb	aa9edc619b06b6207bba7152bbd39b99c8500be9
@@ -0,0 +1,13 @@
+DESCRIPTION = "FreeSmartPhone.org Python Prototypes"
+AUTHOR = "M. Dietrich"
+SECTION = "console/network"
+RDEPENDS = "python-serial python-lang"
+LICENSE = "GPL"
+PV = "0.0+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=py-proto"
+S = "${WORKDIR}/py-proto"
+
+inherit distutils
+
============================================================
--- packages/linux/linux-rp-2.6.23/versatile-armv6.patch	4741cf31febeef15c0b7646588b288c097a3d14c
+++ packages/linux/linux-rp-2.6.23/versatile-armv6.patch	4741cf31febeef15c0b7646588b288c097a3d14c
@@ -0,0 +1,19 @@
+---
+ arch/arm/mm/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.23.orig/arch/arm/mm/Kconfig
++++ linux-2.6.23/arch/arm/mm/Kconfig
+@@ -343,11 +343,11 @@ config CPU_XSC3
+ 	select IO_36
+ 
+ # ARMv6
+ config CPU_V6
+ 	bool "Support ARM V6 processor"
+-	depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3
++	depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_VERSATILE_PB
+ 	default y if ARCH_MX3
+ 	select CPU_32v6
+ 	select CPU_ABRT_EV6
+ 	select CPU_CACHE_V6
+ 	select CPU_CACHE_VIPT
============================================================
--- packages/linux/linux-rp-2.6.23+2.6.24-rc8/connectplus-prevent-oops-HACK.patch	e7f07c5193600ba480642fd62dcae173b6b62189
+++ packages/linux/linux-rp-2.6.23+2.6.24-rc8/connectplus-prevent-oops-HACK.patch	e7f07c5193600ba480642fd62dcae173b6b62189
@@ -0,0 +1,17 @@
+Index: linux-2.6.21/drivers/net/wireless/hostap/hostap_hw.c
+===================================================================
+--- linux-2.6.21.orig/drivers/net/wireless/hostap/hostap_hw.c	2007-07-07 12:45:39.000000000 +0100
++++ linux-2.6.21/drivers/net/wireless/hostap/hostap_hw.c	2007-07-07 12:47:30.000000000 +0100
+@@ -2666,6 +2666,12 @@
+ 	iface = netdev_priv(dev);
+ 	local = iface->local;
+ 
++	if(dev->base_addr == 0)
++	{
++		printk(KERN_DEBUG "%s: IRQ before base_addr set\n", dev->name);
++		return IRQ_HANDLED;
++	}
++
+ 	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 0);
+ 
+ 	if (local->func->card_present && !local->func->card_present(local)) {
============================================================
--- packages/linux/linux-rp-2.6.23+2.6.24-rc8/squashfs3.3.patch	3c2c3d66d9c2e306b9af229c447163389280ca3f
+++ packages/linux/linux-rp-2.6.23+2.6.24-rc8/squashfs3.3.patch	3c2c3d66d9c2e306b9af229c447163389280ca3f
@@ -0,0 +1,4234 @@
+diff -x .gitignore -Nurp linux-2.6.24/fs/Kconfig linux-2.6.24-squashfs3.3/fs/Kconfig
+--- linux-2.6.24/fs/Kconfig	2007-10-25 17:41:45.000000000 +0100
++++ linux-2.6.24-squashfs3.3/fs/Kconfig	2007-11-01 05:06:25.000000000 +0000
+@@ -1396,6 +1396,56 @@ config CRAMFS
+ 
+ 	  If unsure, say N.
+ 
++config SQUASHFS
++	tristate "SquashFS 3.3 - Squashed file system support"
++	select ZLIB_INFLATE
++	help
++	  Saying Y here includes support for SquashFS 3.3 (a Compressed
++	  Read-Only File System).  Squashfs is a highly compressed read-only
++	  filesystem for Linux.  It uses zlib compression to compress both
++	  files, inodes and directories.  Inodes in the system are very small
++	  and all blocks are packed to minimise data overhead. Block sizes
++	  greater than 4K are supported up to a maximum of 1 Mbytes (default
++	  block size 128K).  SquashFS 3.3 supports 64 bit filesystems and files
++	  (larger than 4GB), full uid/gid information, hard links and timestamps.  
++
++	  Squashfs is intended for general read-only filesystem use, for
++	  archival use (i.e. in cases where a .tar.gz file may be used), and in
++	  embedded systems where low overhead is needed.  Further information
++	  and filesystem tools are available from http://squashfs.sourceforge.net.
++
++	  If you want to compile this as a module ( = code which can be
++	  inserted in and removed from the running kernel whenever you want),
++	  say M here and read <file:Documentation/modules.txt>.  The module
++	  will be called squashfs.  Note that the root file system (the one
++	  containing the directory /) cannot be compiled as a module.
++
++	  If unsure, say N.
++
++config SQUASHFS_EMBEDDED
++
++	bool "Additional option for memory-constrained systems"%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list