merge of 619c2a2f86cda6fa47d337c32bb59fd59bfd2697

     and 6c5f6dd92dc9e167c3598305801931820379802a

17 files changed, 158 insertions, 104 deletions

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 5c1ed1296d..9c1208c690 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -52,7 +52,7 @@ PREFERRED_PROVIDER_libx11 = "diet-x11"
 
 #Make sure we use 2.6 on machines with a 2.4/2.6 selector
 KERNEL = "kernel26"
-ZKERNEL_VERSION = "2.6"
+MACHINE_KERNEL_VERSION = "2.6"
 
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf
index d9ace6d629..b26238e66e 100644
--- a/conf/distro/generic-uclibc.conf
+++ b/conf/distro/generic-uclibc.conf
@@ -19,6 +19,7 @@ DISTRO_NAME = "generic-uClibC"
 # Target OS and FPU system
 #
 TARGET_OS = "linux-uclibc"
-TARGET_FPU = "soft"
+TARGET_FPU_arm = "soft"
+TARGET_FPU_armeb = "soft"
 PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
 PREFERRED_PROVIDER_virtual/libintl = "libintl"
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index e6671d1337..594958600f 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -45,7 +45,8 @@ PREFERRED_VERSION_binutils = "2.15.94.0.1"
 # Target OS and FPU system
 # 
 TARGET_OS = "linux"
-TARGET_FPU = "soft"
+TARGET_FPU_arm = "soft"
+TARGET_FPU_armeb = "soft"
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
 PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 9f79c32118..89944023ad 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -25,7 +25,7 @@ DISTRO_TYPE = "debug"
 #            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
 #              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
 
-SRCDATE = "20060514"
+SRCDATE ?= "20060514"
 #
 # Zaurus
 #
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 4417b67862..9d23b654cf 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -88,9 +88,10 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 # ENABLE_BINARY_LOCALE_GENERATION = "0"
 # ASSUME_PROVIDED += "qemu-native"
 
-# Uncomment this to select a particular kernel version if supported by 
-# your MACHINE setting. Currently only supported by poodle and tosa.
-# ZKERNEL_VERSION = "2.6"
+# Uncomment this to select a particular major kernel version if the MACHINE setting
+# supports more than one major kernel version. Currently this is suported by the
+# following MACHINE types: poodle, tosa and simpad.
+# MACHINE_KERNEL_VERSION = "2.6"
 
 # Uncomment one of these to build packages during the build process.
 # This is done automatically if you set DISTRO (see above)
diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.conf
new file mode 100644
index 0000000000..b5fda186ca
--- /dev/null
+++ b/conf/machine/include/simpad-2.4.conf
@@ -0,0 +1,7 @@
+PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
+
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules orinoco-modules \
+orinoco-modules-cs pcmcia-cs apm hostap-utils wpa-supplicant-nossl"
diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.conf
new file mode 100644
index 0000000000..a5f4962c75
--- /dev/null
+++ b/conf/machine/include/simpad-2.6.conf
@@ -0,0 +1,4 @@
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "udev module-init-tools"
diff --git a/conf/machine/native.conf b/conf/machine/native.conf
index 92c3072c8c..d3c77bf9bd 100644
--- a/conf/machine/native.conf
+++ b/conf/machine/native.conf
@@ -7,7 +7,7 @@ TARGET_PREFIX = ""
 VENDOR = "-oe"
 
 PREFERRED_PROVIDER_virtual/kernel = "native-kernel"
-ASSUME_PROVIDED += "virtual/gcc-initial virtual/gcc virtual/g++"
+ASSUME_PROVIDED += "virtual/gcc-initial virtual/gcc virtual/g++ virtual/libc virtual/libintl virtual/libiconv"
 ASSUME_PROVIDED += "binutils-cross"
 ASSUME_PROVIDED += "virtual/libiconv virtual/libintl virtual/libc"
 
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index 79915e4f74..49eaf1ef4b 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -5,8 +5,8 @@
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
-ZKERNEL_VERSION ?= "2.4"
-include conf/machine/include/poodle-${ZKERNEL_VERSION}.conf
+MACHINE_KERNEL_VERSION ?= "2.4"
+include conf/machine/include/poodle-${MACHINE_KERNEL_VERSION}.conf
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
 
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 43097d871e..b227312589 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -2,24 +2,12 @@
 #@NAME: SIEMENS SIMpad SL4, SIEMENS SIMpad CL4, SIEMENS SIMpad SLC, Telekom T-Sinus PAD
 #@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices
 
-KERNEL ?= "kernel24"
-#KERNEL ?= "kernel26"
-
-OVERRIDES =. "${KERNEL}:"
+MACHINE_KERNEL_VERSION ?= "2.4"
+require conf/include/simpad-${MACHINE_KERNEL_VERSION}.conf
 
 TARGET_ARCH = "arm"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel_kernel24 = "opensimpad-64+0"
-PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
-PREFERRED_PROVIDERS_kernel26 += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
-
-# Later versions are broken on kernel 2.4
-PREFERRED_VERSION_orinoco-modules_kernel24 = "0.13e"
-
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 += "udev module-init-tools"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 += "hostap-modules orinoco-modules \
-orinoco-modules-cs pcmcia-cs apm hostap-utils wpa-supplicant-nossl"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel"
 
 BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs orinoco-modules-cs \
 kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \
@@ -38,6 +26,6 @@ ROOT_FLASH_SIZE = "16"
 USE_VT = "0"
 GPE_EXTRA_INSTALL += "suspend-desktop"
 
-include conf/machine/include/handheld-common.conf
-include conf/machine/include/tune-strongarm.conf
+require conf/machine/include/handheld-common.conf
+require conf/machine/include/tune-strongarm.conf
 
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index 751b498f14..2652004f82 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -5,8 +5,8 @@
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
-ZKERNEL_VERSION ?= "2.4"
-include conf/machine/include/tosa-${ZKERNEL_VERSION}.conf
+MACHINE_KERNEL_VERSION ?= "2.4"
+include conf/machine/include/tosa-${MACHINE_KERNEL_VERSION}.conf
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
 
diff --git a/packages/gammu/gammu_1.06.00.bb b/packages/gammu/gammu_1.06.00.bb
deleted file mode 100644
index 2611050afb..0000000000
--- a/packages/gammu/gammu_1.06.00.bb
+++ /dev/null
@@ -1,65 +0,0 @@
-DESCRIPTION = "GNU All Mobile Managment Utilities"
-SECTION = "console/network"
-DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html"
-AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
-PR = "r1"
-
-SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz "
-
-EXTRA_OECONF = "--disable-mysql"
-
-inherit autotools pkgconfig
-
-do_compile () {
-        oe_runmake shared
-}
-
-# FIXME instead of ripping the complete autotools_stage_all, just because
-# FIXME gammu needs an additional install target (installshared), it might
-# FIXME be more appropriate to a) make the install target in autotools_stage_all
-# FIXME customizable or b) alter gammu makefall to make 'install' depend on 'installshared'. :M:
-do_stage() {
-        rm -rf ${STAGE_TEMP}
-        mkdir -p ${STAGE_TEMP}
-        oe_runmake DESTDIR="${STAGE_TEMP}" install
-	oe_runmake DESTDIR="${STAGE_TEMP}" installshared
-        if [ -d ${STAGE_TEMP}/${includedir} ]; then
-                cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
-        fi
-        if [ -d ${STAGE_TEMP}/${libdir} ]
-        then
-                for i in ${STAGE_TEMP}/${libdir}/*.la
-                do
-                        if [ ! -f "$i" ]; then
-                                cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
-                                break
-                        fi
-                        oe_libinstall -so $(basename $i .la) ${STAGING_LIBDIR}
-                done
-        fi
-        if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
-                install -d ${STAGING_DATADIR}/aclocal
-                cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
-        fi
-        rm -rf ${STAGE_TEMP}
-}
-
-do_install () {
-        oe_runmake 'DESTDIR=${D}' installshared
-}
-
-PACKAGES =+ "libgammu"
-
-FILES_${PN} = "${bindir}/gammu"
-FILES_libgammu = "${libdir}/libGammu.so*"
-
-PACKAGES_DYNAMIC = "gammu-locale-*"
-
-python populate_packages_prepend () {
-        help_dir = bb.data.expand('${datadir}/gammu/', d)
-        
-        do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
-}
diff --git a/packages/gammu/gammu_1.07.00.bb b/packages/gammu/gammu_1.07.00.bb
new file mode 100644
index 0000000000..514819935c
--- /dev/null
+++ b/packages/gammu/gammu_1.07.00.bb
@@ -0,0 +1,76 @@
+DESCRIPTION = "GNU All Mobile Managment Utilities"
+SECTION = "console/network"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html"
+AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+
+SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz "
+
+EXTRA_OECONF = "--disable-mysql"
+
+inherit autotools
+
+do_compile () {
+        oe_runmake shared
+}
+
+do_stage() {
+        install -d ${STAGING_INCDIR}/gammu/misc  ${STAGING_INCDIR}/gammu/misc/coding \
+                   ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \
+                   ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \
+                   ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku \
+                   ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \
+                   ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \
+                   ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \
+                   ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \
+                   ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \
+                   ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \
+                   ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \
+                   ${STAGING_INCDIR}/gammu/protocol/alcatel
+
+        oe_libinstall -so -C common libGammu ${STAGING_LIBDIR}
+
+        install -m 0644 common/*.h                      ${STAGING_INCDIR}/gammu/
+        install -m 0644 common/misc/*.h                 ${STAGING_INCDIR}/gammu/misc 
+        install -m 0644 common/misc/coding/*.h          ${STAGING_INCDIR}/gammu/misc/coding 
+        install -m 0644 common/phone/*.h                ${STAGING_INCDIR}/gammu/phone 
+        install -m 0644 common/phone/at/*.h             ${STAGING_INCDIR}/gammu/phone/at 
+        install -m 0644 common/phone/obex/*.h           ${STAGING_INCDIR}/gammu/phone/obex 
+        install -m 0644 common/phone/nokia/*.h          ${STAGING_INCDIR}/gammu/phone/nokia 
+        install -m 0644 common/phone/nokia/dct3/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct3 
+        install -m 0644 common/phone/nokia/dct4tiku/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku
+        install -m 0644 common/phone/symbian/*.h        ${STAGING_INCDIR}/gammu/phone/symbian 
+        install -m 0644 common/phone/alcatel/*.h        ${STAGING_INCDIR}/gammu/phone/alcatel 
+        install -m 0644 common/service/*.h              ${STAGING_INCDIR}/gammu/service 
+        install -m 0644 common/service/sms/*.h          ${STAGING_INCDIR}/gammu/service/sms 
+        install -m 0644 common/service/backup/*.h       ${STAGING_INCDIR}/gammu/service/backup 
+        install -m 0644 common/device/*.h               ${STAGING_INCDIR}/gammu/device 
+        install -m 0644 common/device/irda/*.h          ${STAGING_INCDIR}/gammu/device/irda 
+        install -m 0644 common/device/bluetoth/*.h      ${STAGING_INCDIR}/gammu/device/bluetoth 
+        install -m 0644 common/device/serial/*.h        ${STAGING_INCDIR}/gammu/device/serial 
+        install -m 0644 common/protocol/*.h             ${STAGING_INCDIR}/gammu/protocol 
+        install -m 0644 common/protocol/at/*.h          ${STAGING_INCDIR}/gammu/protocol/at 
+        install -m 0644 common/protocol/obex/*.h        ${STAGING_INCDIR}/gammu/protocol/obex 
+        install -m 0644 common/protocol/nokia/*.h       ${STAGING_INCDIR}/gammu/protocol/nokia 
+        install -m 0644 common/protocol/symbian/*.h     ${STAGING_INCDIR}/gammu/protocol/symbian 
+        install -m 0644 common/protocol/alcatel/*.h     ${STAGING_INCDIR}/gammu/protocol/alcatel
+}
+
+do_install () {
+        oe_runmake 'DESTDIR=${D}' installshared
+}
+
+PACKAGES =+ "libgammu"
+
+FILES_${PN} = "${bindir}/gammu"
+FILES_libgammu = "${libdir}/libGammu.so*"
+
+PACKAGES_DYNAMIC = "gammu-locale-*"
+
+python populate_packages_prepend () {
+        help_dir = bb.data.expand('${datadir}/gammu/', d)
+        
+        do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
+}
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index 54605cd26a..dc187ad3b4 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r34"
+PR = "r35"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -106,12 +106,12 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            file://defconfig-qemuarm \
            file://defconfig-tosa "
 
-SRC_URI_append_c7x0   = "file://oz-logo-640.patch.bz2;patch=1"
-SRC_URI_append_akita  = "file://oz-logo-640.patch.bz2;patch=1"
-SRC_URI_append_spitz  = "file://oz-logo-640.patch.bz2;patch=1"
-SRC_URI_append_collie = "file://oz-logo-240.patch.bz2;patch=1"
-SRC_URI_append_poodle = "file://oz-logo-240.patch.bz2;patch=1"
-SRC_URI_append_tosa   = "file://oz-logo-480.patch.bz2;patch=1"
+SRC_URI_append_c7x0   = " file://oz-logo-640.patch.bz2;patch=1 "
+SRC_URI_append_akita  = " file://oz-logo-640.patch.bz2;patch=1 "
+SRC_URI_append_spitz  = " file://oz-logo-640.patch.bz2;patch=1 "
+SRC_URI_append_collie = " file://oz-logo-240.patch.bz2;patch=1 "
+SRC_URI_append_poodle = " file://oz-logo-240.patch.bz2;patch=1 "
+SRC_URI_append_tosa   = " file://oz-logo-480.patch.bz2;patch=1 "
 
 SRC_URI += "file://squashfs3.0-2.6.15.patch;patch=1"
 
diff --git a/packages/opie-mediummount/opie-mediummount-1.2.1/.mtn2git_empty b/packages/opie-mediummount/opie-mediummount-1.2.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-mediummount/opie-mediummount-1.2.1/.mtn2git_empty
diff --git a/packages/opie-mediummount/opie-mediummount-1.2.1/firststart-no-popup.patch b/packages/opie-mediummount/opie-mediummount-1.2.1/firststart-no-popup.patch
new file mode 100644
index 0000000000..fd5542e392
--- /dev/null
+++ b/packages/opie-mediummount/opie-mediummount-1.2.1/firststart-no-popup.patch
@@ -0,0 +1,40 @@
+Index: mainwindow.cc
+===================================================================
+RCS file: /cvs/opie/noncore/settings/mediummount/mainwindow.cc,v
+retrieving revision 1.7
+diff -u -r1.7 mainwindow.cc
+--- mediummount/mainwindow.cc	19 Sep 2004 19:11:07 -0000	1.7
++++ mediummount/mainwindow.cc	14 Jun 2006 15:30:05 -0000
+@@ -1,5 +1,6 @@
+ 
+ 
++#include <qpe/config.h>
+ #include <qtabwidget.h>
+ #include <qlayout.h>
+ #include <qtooltip.h>
+@@ -20,15 +21,20 @@
+   : QDialog( parent, name, modal, WStyle_ContextHelp  )
+ 
+ {
+-    setCaption ( tr( "Medium Mount Settings" ));
++    Config c( "qpe" );
++    c.setGroup( "Startup" );
++    if ( c.readNumEntry( "FirstUse", 42 ) != 0 )
++    {
++	setCaption ( tr( "Medium Mount Settings" ));
+ 
+-    m_lay = new QVBoxLayout( this );
++	m_lay = new QVBoxLayout( this );
+ 
+-    m_tab = new QTabWidget( this );
++	m_tab = new QTabWidget( this );
+ 
+-    m_lay->addWidget( m_tab );
++	m_lay->addWidget( m_tab );
+ 
+-    init();
++	init();
++    }
+ }
+ 
+ MainWindow::~MainWindow()
diff --git a/packages/opie-mediummount/opie-mediummount_1.2.1.bb b/packages/opie-mediummount/opie-mediummount_1.2.1.bb
index 0c887950a8..0eaff4ad86 100644
--- a/packages/opie-mediummount/opie-mediummount_1.2.1.bb
+++ b/packages/opie-mediummount/opie-mediummount_1.2.1.bb
@@ -1,7 +1,8 @@
 include ${PN}.inc
-    
- 
+
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+	   file://firststart-no-popup.patch;patch=1"