merge of '8a114c24deca9328747f14101e87db8845400833'

     and 'f02f7da26cf1279907a41d7957e054f42575adbd'

15 files changed, 56 insertions, 20 deletions

diff --git a/classes/image.bbclass b/classes/image.bbclass
index 83aa80a97e..5055b5b987 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -165,7 +165,14 @@ make_zimage_symlink_relative () {
 	fi
 }
 
+# Make login manager(s) enable automatic login.
+# Useful for devices where we do not want to log in at all (e.g. phones)
+set_image_autologin () {
+        sed -i 's%^AUTOLOGIN=\"false"%AUTOLOGIN="true"%g' ${IMAGE_ROOTFS}/etc/sysconfig/gpelogin
+}
+
+
 # export the zap_root_password, create_etc_timestamp and remote_init_link
-EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link do_rootfs make_zimage_symlink_relative
+EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link do_rootfs make_zimage_symlink_relative set_image_autologin
 
 addtask rootfs before do_build after do_install
diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf
index f2fee9f1c8..d2e59f85a4 100644
--- a/conf/distro/angstrom-2007.1-oabi.conf
+++ b/conf/distro/angstrom-2007.1-oabi.conf
@@ -11,7 +11,7 @@ TARGET_OS = "linux"
 PACKAGE_ARCH = "arm-oabi"
 PACKAGE_EXTRA_ARCHS = "arm-oabi"
 
-PREFERRED_VERSION_linux-handhelds-2.6_h3600 = "2.6.19-hh12"
+PREFERRED_VERSION_linux-handhelds-2.6_h3600 = "2.6.19-hh13"
 
 FEED_ARCH_collie       = "arm-oabi"
 FEED_ARCH_h3600        = "arm-oabi"
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 187d7c6bf1..d6766bedbc 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -85,8 +85,8 @@ FEED_URIS += " \
 #SRCDATE = "20070303"
 
 PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
-PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh12"
-PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh12"
+PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh13"
+PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13"
 
 PREFERRED_VERSION_file = "4.18"
 PREFERRED_VERSION_file_native = "4.18"
diff --git a/packages/gpe-conf/gpe-conf_0.2.4.bb b/packages/gpe-conf/gpe-conf_0.2.4.bb
index deea518a86..4a45b599a1 100644
--- a/packages/gpe-conf/gpe-conf_0.2.4.bb
+++ b/packages/gpe-conf/gpe-conf_0.2.4.bb
@@ -4,10 +4,10 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 
 DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client"
-RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons timezones"
+RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons timezones"
 RDEPENDS_gpe-conf-panel = "gpe-conf"
 
-PR = "r0"
+PR = "r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-conf/gpe-conf_svn.bb b/packages/gpe-conf/gpe-conf_svn.bb
index e4675ecfae..f3782ef0ac 100644
--- a/packages/gpe-conf/gpe-conf_svn.bb
+++ b/packages/gpe-conf/gpe-conf_svn.bb
@@ -5,13 +5,13 @@ SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons"
-RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons"
+DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ntp gpe-login gpe-icons"
+RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons"
 RDEPENDS_gpe-conf-panel = "gpe-conf"
 
 inherit autotools gpe
 
-PV = "0.2.2+svn${SRCDATE}"
+PV = "0.2.5+svn${SRCDATE}"
 PR = "r0"
 
 SRC_URI = "${GPE_SVN}"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
index 583fe2f7e3..3596e4e6cd 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -4,14 +4,14 @@ DESCRIPTION = "GPE session startup scripts"
 LICENSE = "GPL"
 SECTION = "gpe"
 PRIORITY = "optional"
-RDEPENDS_${PN} = "matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common"
-# more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common"
+RDEPENDS_${PN} = "matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common ipaq-sleep"
+# more rdepends: keylaunch apmd blueprobe
+DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common ipaq-sleep"
 
 SRC_URI += "file://matchbox-session \
 	file://disable-composite.xsettings"
 
-PR = "r6"
+PR = "r7"
 
 #apply a patch to set the fontsize for bigdpi (200+) devices to 5
 SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1"
diff --git a/packages/gpephone/gpe-applauncher-0.7/.mtn2git_empty b/packages/gpephone/gpe-applauncher-0.7/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/gpe-applauncher-0.7/.mtn2git_empty
diff --git a/packages/gpephone/gpe-applauncher-0.7/default-icon.patch b/packages/gpephone/gpe-applauncher-0.7/default-icon.patch
new file mode 100644
index 0000000000..e1ec24f141
--- /dev/null
+++ b/packages/gpephone/gpe-applauncher-0.7/default-icon.patch
@@ -0,0 +1,20 @@
+Index: applications.c
+===================================================================
+--- applications.c	(Revision 598)
++++ applications.c	(Arbeitskopie)
+@@ -463,8 +463,13 @@
+                                          applauncher_settings.themename ? applauncher_settings.themename : "default",
+                                          THEMEFOLDER, ICON_LOADING, NULL);
+               }
+-             
+-            g_print ("\nloading icon: %s\n", file);
++              
++            if (!g_file_test (file, G_FILE_TEST_EXISTS))
++              {
++                g_free (file);
++                file = g_build_filename (LOCAL_THEMEDIR, "default",
++                                         THEMEFOLDER, ICON_LOADING, NULL);
++              }
+                 
+             nc_window = gtk_app_notification_new();
+             gtk_widget_set_size_request(GTK_WIDGET(nc_window), -1, 70);
diff --git a/packages/gpephone/gpe-applauncher_0.7.bb b/packages/gpephone/gpe-applauncher_0.7.bb
index ae6cd31d9a..349330047b 100644
--- a/packages/gpephone/gpe-applauncher_0.7.bb
+++ b/packages/gpephone/gpe-applauncher_0.7.bb
@@ -2,13 +2,15 @@ LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r0"
+PR          = "r1"
 
 DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libxsettings-client"
 
 GPE_TARBALL_SUFFIX= "gz"
 inherit gpephone autotools
 
+SRC_URI += " file://default-icon.patch;patch=1;pnum=0"
+
 #EXTRA_OECONF = "--enable-gridlayout"
 
 FILES_${PN} += '${datadir}/themes'
diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession
index b08aa74dbc..8fb5065d67 100755
--- a/packages/gpephone/gpe-session-scripts-phone/phonesession
+++ b/packages/gpephone/gpe-session-scripts-phone/phonesession
@@ -45,8 +45,8 @@ soundserver &
 
 # Run GSM support stuff
 
-cms92init &
+#cms92init &
 gsmMux -d -p /dev/ttyS0 -m cms92 -f 128 -b 115200 -c /dev/ptmx /dev/ptmx &
 
 # Start PhoneServer
-phoneserver &
+phoneserver
diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
index beb1b360ad..afa4fb1683 100644
--- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb
+++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
@@ -4,8 +4,8 @@ DESCRIPTION = "GPE session startup scripts hack for GPE Phone Edition"
 LICENSE = "GPL"
 SECTION = "gpe"
 PRIORITY = "optional"
-RDEPENDS_${PN} = "gpe-applauncher gpe-phonepanel gpe-session-starter gpe-question xmodmap xdpyinfo xserver-common"
-DEPENDS = "matchbox-wm gpe-applauncher gpe-phonepanel gpe-question xmodmap xdpyinfo xserver-common"
+RDEPENDS_${PN} = "gpe-applauncher gpe-phonepanel gpe-session-starter gpe-question xmodmap xdpyinfo xserver-common esd esd-utils"
+DEPENDS = "matchbox-wm gpe-applauncher gpe-phonepanel gpe-question xmodmap xdpyinfo xserver-common esound"
 
 SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
            file://matchbox-session \
@@ -13,7 +13,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
            file://phonesession \
 	   file://disable-composite.xsettings"
 
-PR = "r1"
+PR = "r2"
 
 S = "${WORKDIR}/gpe-session-scripts-${PV}"
 
diff --git a/packages/images/gpephone-image-vm.bb b/packages/images/gpephone-image-vm.bb
index 472577be8b..a058361f27 100644
--- a/packages/images/gpephone-image-vm.bb
+++ b/packages/images/gpephone-image-vm.bb
@@ -36,4 +36,7 @@ export PACKAGE_INSTALL = "\
 
 inherit image
 
+ROOTFS_POSTPROCESS_COMMAND += "set_image_autologin; "
+
+
 LICENSE = "MIT"
diff --git a/packages/images/gpephone-image.bb b/packages/images/gpephone-image.bb
index 2fe9e3b3fc..e9735f19c4 100644
--- a/packages/images/gpephone-image.bb
+++ b/packages/images/gpephone-image.bb
@@ -34,5 +34,9 @@ export PACKAGE_INSTALL = "\
     ${XSERVER} \
     ${GPE_EXTRA_INSTALL}"
 
+
 inherit image
+
+ROOTFS_POSTPROCESS_COMMAND += "set_image_autologin; "
+
 LICENSE = "MIT"
diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh12.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb
index ec5844bfb5..ec5844bfb5 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.19-hh12.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb
diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb
index 2211bab8f0..0f9a38b631 100644
--- a/packages/linux/linux-handhelds-2.6_cvs.bb
+++ b/packages/linux/linux-handhelds-2.6_cvs.bb
@@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1"
 K_MAJOR = "2"
 K_MINOR = "6"
 K_MICRO = "20"
-HHV     = "1"
+HHV     = "2"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
            file://defconfig"