[oe-commits] Richard Purdie : bitbake.conf: Drop unused *GUI* and MACHINE_DISPLAY variables

[git version control]

Module: openembedded-core.git
Branch: master
Commit: baf136a9c95a94c5bf89c9a818960d616439682c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=baf136a9c95a94c5bf89c9a818960d616439682c

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue May 10 16:19:02 2011 +0100

bitbake.conf: Drop unused *GUI* and MACHINE_DISPLAY variables

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/conf/bitbake.conf             |    8 --------
 meta/conf/machine/include/qemu.inc |    2 --
 2 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4a1bfa1..fb488ae 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -667,14 +667,6 @@ DISTRO_FEATURES ?= ""
 # This is used to limit what packages goes into images built, so set big by default
 ROOT_FLASH_SIZE ?= "256"
 
-MACHINE_GUI_CLASS ?= "smallscreen"
-# GUI_MACHINE_CLASS is deprecated, please use MACHINE_GUI_CLASS instead
-GUI_MACHINE_CLASS ?= "${MACHINE_GUI_CLASS}"
-MACHINE_DISPLAY_WIDTH_PIXELS ?= "240"
-MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320"
-MACHINE_DISPLAY_ORIENTATION ?= "0"
-MACHINE_DISPLAY_BPP ?= "16"
-
 DISTRO_EXTRA_RDEPENDS ?= ""
 DISTRO_EXTRA_RRECOMMENDS ?= ""
 MACHINE_EXTRA_RDEPENDS ?= ""
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 61281bf..4122a88 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -1,7 +1,5 @@
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"