From 9ef3656dda22454ba97bed03324cdf19dfb28dfe Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 6 Mar 2007 14:44:54 +0000 Subject: gpe-applauncher: Make sure default loading icon is found. --- packages/gpephone/gpe-applauncher-0.7/.mtn2git_empty | 0 .../gpephone/gpe-applauncher-0.7/default-icon.patch | 20 ++++++++++++++++++++ packages/gpephone/gpe-applauncher_0.7.bb | 4 +++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 packages/gpephone/gpe-applauncher-0.7/.mtn2git_empty create mode 100644 packages/gpephone/gpe-applauncher-0.7/default-icon.patch 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 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' -- cgit v1.2.3 From 4f7e7962aba40b11ffb0dfa4abfb58fd47e6ce95 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 6 Mar 2007 14:59:46 +0000 Subject: gpe-session-scripts-phone: Some session startup fixes, correct dependencies. --- packages/gpephone/gpe-session-scripts-phone/phonesession | 4 ++-- packages/gpephone/gpe-session-scripts-phone_0.67.bb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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}" -- cgit v1.2.3 From 22c3cde057684ae103e1267a8123e0e3c6a19ad9 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 6 Mar 2007 15:14:43 +0000 Subject: gpe-session-scripts: Pull in ipaq-sleep. --- packages/gpe-session-scripts/gpe-session-scripts_0.67.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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" -- cgit v1.2.3 From 97eb2312e9c34c4972ab3ddd01ef4aba1a916414 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 6 Mar 2007 15:16:42 +0000 Subject: gpe-conf: Do not depend on ipaq-sleep directly. --- packages/gpe-conf/gpe-conf_0.2.4.bb | 4 ++-- packages/gpe-conf/gpe-conf_svn.bb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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}" -- cgit v1.2.3 From bea4a815fb63dd0bdf329c7bfff7a5e19ef60dfc Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 6 Mar 2007 15:56:42 +0000 Subject: image.bbclass: Add function to turn on autologin for device images we do not want to log in at all. --- classes/image.bbclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3 From b62ed10b4e5b2f956e28449e5aa81f6435c45308 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 6 Mar 2007 15:57:28 +0000 Subject: gpephone-image: Turn on automatic login. --- packages/images/gpephone-image.bb | 4 ++++ 1 file changed, 4 insertions(+) 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" -- cgit v1.2.3 From bc63d79985ece0bdf9ea69a0df0a25fcc36f6c3c Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 6 Mar 2007 15:58:43 +0000 Subject: gpephone-image-vm: Turn on automatic login. --- packages/images/gpephone-image-vm.bb | 3 +++ 1 file changed, 3 insertions(+) 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" -- cgit v1.2.3 From 1dabe68b10f54137bf9db133fbbdc30a143ec549 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 6 Mar 2007 17:39:34 +0000 Subject: linux-handhelds-2.6 cvs: CVS HEAD is now 2.6.20-hh2. --- packages/linux/linux-handhelds-2.6_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- cgit v1.2.3 From abbb0c6e198af23ee2216bd6849d91a70cb4ba6c Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 6 Mar 2007 17:44:05 +0000 Subject: linux-handhelds-2.6 2.6.19-hh13: -hh12 contained typo preventing build for most machines. This is fixed in -hh13. Also, update references to -hh12. --- conf/distro/angstrom-2007.1-oabi.conf | 2 +- conf/distro/angstrom-2007.1.conf | 4 ++-- packages/linux/linux-handhelds-2.6_2.6.19-hh12.bb | 11 ----------- packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb | 11 +++++++++++ 4 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 packages/linux/linux-handhelds-2.6_2.6.19-hh12.bb create mode 100644 packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb 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 f3c4a63217..e868ed581d 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" SRCDATE_gconf-dbus = "20060719" diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh12.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh12.bb deleted file mode 100644 index ec5844bfb5..0000000000 --- a/packages/linux/linux-handhelds-2.6_2.6.19-hh12.bb +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "kernel" -DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" -PR = "r1" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ - file://defconfig" - -require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb new file mode 100644 index 0000000000..ec5844bfb5 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb @@ -0,0 +1,11 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." +LICENSE = "GPL" +PR = "r1" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig" + +require linux-handhelds-2.6.inc -- cgit v1.2.3