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

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

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4a1bfa168b8ace76949e87f606bb2fbf5ed1bbaa..fb488aefc411cbd7f90f73d6c0e4b8f4210b9450 100644 (file)
--- 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 61281bf516c5080fddc1cb302c28a594cbd6a053..4122a882dd46a43ec3a03462f29dc65a3a8ba735 100644 (file)
--- 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"