diff options
author | Richard Purdie <richard@openedhand.com> | 2006-09-21 11:51:48 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-09-21 11:51:48 +0000 |
commit | 514ab79d137939c9047a486c41ec1d03b06f3ba2 (patch) | |
tree | 9eac4220ce06645716ea8162b4bdc496cb8144fb | |
parent | 7272744e94b4789b76a062add67d36170dc50233 (diff) | |
download | poky-514ab79d137939c9047a486c41ec1d03b06f3ba2.tar.gz |
clean up some unneeded references/variables
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@732 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r-- | meta/conf/distro/poky.conf | 1 | ||||
-rw-r--r-- | meta/conf/machine/include/qemu.conf | 1 | ||||
-rw-r--r-- | meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index d96a8d7800..ee3ec0680f 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
@@ -145,7 +145,6 @@ PREFERRED_VERSION_evince ?= "0.3.2" | |||
145 | PREFERRED_VERSION_firefox ?= "1.0" | 145 | PREFERRED_VERSION_firefox ?= "1.0" |
146 | PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" | 146 | PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" |
147 | PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" | 147 | PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" |
148 | PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" | ||
149 | PREFERRED_VERSION_keylaunch ?= "2.0.7" | 148 | PREFERRED_VERSION_keylaunch ?= "2.0.7" |
150 | PREFERRED_VERSION_librsvg ?= "2.6.5" | 149 | PREFERRED_VERSION_librsvg ?= "2.6.5" |
151 | PREFERRED_VERSION_libgsm ?= "1.0.10" | 150 | PREFERRED_VERSION_libgsm ?= "1.0.10" |
diff --git a/meta/conf/machine/include/qemu.conf b/meta/conf/machine/include/qemu.conf index 83ddf24b87..c896c38f57 100644 --- a/meta/conf/machine/include/qemu.conf +++ b/meta/conf/machine/include/qemu.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | PCMCIA_MANAGER = "pcmciautils" | 1 | PCMCIA_MANAGER = "pcmciautils" |
2 | PREFERRED_PROVIDER_xserver = "xserver-kdrive" | 2 | PREFERRED_PROVIDER_xserver = "xserver-kdrive" |
3 | GUI_MACHINE_CLASS = "bigscreen" | 3 | GUI_MACHINE_CLASS = "bigscreen" |
4 | GPE_EXTRA_INSTALL += "gaim sylpheed" | ||
5 | 4 | ||
6 | MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget" | 5 | MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget" |
7 | 6 | ||
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 b607462fe3..a438e13050 100644 --- 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | # this location MUST be consistent with /etc/X11/gpe-login.pre-session | ||
4 | HOME_VOLATILE=/home/$USER/ramdisk | 3 | HOME_VOLATILE=/home/$USER/ramdisk |
5 | export HOME_VOLATILE | 4 | export HOME_VOLATILE |
6 | 5 | ||