Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/11 19:23:46+02:00 utwente.nl!koen
matchbox-session:
  remove gpe-appmgr for the time being

2005/05/11 19:22:21+02:00 utwente.nl!koen
meta-sectest-gpe.bb, meta-gpe.bb, gpe-image.bb:
  remove gpe-appmgr for the time being

2005/05/11 19:10:15+02:00 utwente.nl!koen
gpe-conf_0.1.23.bb: < florian_kc> koen: i must have been drunk... please fix this.

BKrev: 42824366SwYYjGDmKQ-B9cfACDk_IQ

diff --git a/packages/gpe-conf/gpe-conf_0.1.23.bb b/packages/gpe-conf/gpe-conf_0.1.23.bb
index ddf9e71..cc27bdc 100644 (file)
--- a/packages/gpe-conf/gpe-conf_0.1.23.bb
+++ b/packages/gpe-conf/gpe-conf_0.1.23.bb
@@ -9,9 +9,9 @@ PR="r3"
 SRC_URI += "file://remove-popup.patch;patch=1;pnum=1"
 SRC_URI += "file://desktop-categories.patch;patch=1"
 
-DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons gpe-appmgr"
+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"
-RDEPENDS_gpe-conf-panel = "gpe-conf gpe-appmgr"
+RDEPENDS_gpe-conf-panel = "gpe-conf"
 FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \
                ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \
                ${datadir}/gpe-conf"

diff --git a/packages/gpe-session-scripts/files/matchbox-session b/packages/gpe-session-scripts/files/matchbox-session
index e69de29..03d0df4 100644 (file)
--- a/packages/gpe-session-scripts/files/matchbox-session
+++ b/packages/gpe-session-scripts/files/matchbox-session
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
+
+  matchbox-desktop &
+
+matchbox-panel  --orientation south &
+exec matchbox-window-manager $@
+

diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index 640da98..59f4ad9 100644 (file)
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -18,14 +18,14 @@ GPE_EXTRA_THEMES = "gtk-theme-industrial matchbox-themes-extra-industrial"
 #GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
 #GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
 GPE_EXTRA_DEPENDS_bigscreen = "minimo figment"
-GPE_EXTRA_INSTALL_bigscreen = "minimo figment gpe-task-games ${GPE_EXTRA_THEMES} gpe-appmgr"
+GPE_EXTRA_INSTALL_bigscreen = "minimo figment gpe-task-games ${GPE_EXTRA_THEMES}"
 
 GPE_EXTRA_DEPENDS_smallscreen = "minimo figment linphone-hh"
 GPE_EXTRA_INSTALL_smallscreen = "minimo figment linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}"
 
 #h3900 has 32mb of *useable* flash
-GPE_EXTRA_DEPENDS_append_h3900 = " vlc-gpe "
-GPE_EXTRA_INSTALL_append_h3900 = " vlc-gpe "
+#GPE_EXTRA_DEPENDS_append_h3900 = " vlc-gpe "
+#GPE_EXTRA_INSTALL_append_h3900 = " vlc-gpe "
 
 GPE_EXTRA_DEPENDS_none = ""
 GPE_EXTRA_INSTALL_none = ""
@@ -42,7 +42,7 @@ export IPKG_INSTALL = "task-bootstrap gpe-task-base \
                       ${XSERVER} \
                       ${GPE_EXTRA_INSTALL}"
 
-ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
+#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk
 LICENSE = MIT

diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index e3abaed..4c8e6de 100644 (file)
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -101,6 +101,6 @@ gpe-task-games = "\
 RDEPENDS_gpe-task-games := "${gpe-task-games}"
 DEPENDS += " ${gpe-task-games}"
 
-DEPENDS += "gpe-appmgr matchbox-themes-extra"
+DEPENDS += "matchbox-themes-extra"
 
 LICENSE = MIT

diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb
index ba09c02..dd393fc 100644 (file)
--- a/packages/meta/meta-sectest-gpe.bb
+++ b/packages/meta/meta-sectest-gpe.bb
@@ -31,7 +31,6 @@ gpe-task-base = "\
     gpe-autostarter \
     gpe-bootsplash \
     libgtkstylus \
-    gpe-appmgr \
     detect-stylus"
 
 RDEPENDS_gpe-task-base := "gdk-pixbuf-loader-png \
@@ -83,7 +82,8 @@ sectest-task-apps = "\
     dsniff \
     prismstumbler \
     tcpdump \
-    miniclipboard"
+    kismet \
+       miniclipboard"
 
 RDEPENDS_sectest-task-apps := "${sectest-task-apps}"
 DEPENDS += " ${sectest-task-apps}"