clean up some unneeded references/variables

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@732 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index d96a8d7..ee3ec06 100644 (file)
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -145,7 +145,6 @@ PREFERRED_VERSION_evince ?= "0.3.2"
 PREFERRED_VERSION_firefox ?= "1.0"
 PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
 PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
-PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
 PREFERRED_VERSION_keylaunch ?= "2.0.7"
 PREFERRED_VERSION_librsvg ?= "2.6.5"
 PREFERRED_VERSION_libgsm ?= "1.0.10"

diff --git a/meta/conf/machine/include/qemu.conf b/meta/conf/machine/include/qemu.conf
index 83ddf24..c896c38 100644 (file)
--- a/meta/conf/machine/include/qemu.conf
+++ b/meta/conf/machine/include/qemu.conf
@@ -1,7 +1,6 @@
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
 

diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
index b607462..a438e13 100644 (file)
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# this location MUST be consistent with /etc/X11/gpe-login.pre-session
 HOME_VOLATILE=/home/$USER/ramdisk
 export HOME_VOLATILE