summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-10 16:19:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-11 15:38:33 +0100
commit0504d36646f8def4829250a9eee0cf9bac3b756e (patch)
tree84ffed0ac44ae1f89ad3032d7bced908c68ac7ee
parentc444341689f63ba4c0ed33829cfd7fc54d49414a (diff)
downloadpoky-0504d36646f8def4829250a9eee0cf9bac3b756e.tar.gz
bitbake.conf: Drop unused *GUI* and MACHINE_DISPLAY variables
(From OE-Core rev: baf136a9c95a94c5bf89c9a818960d616439682c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf8
-rw-r--r--meta/conf/machine/include/qemu.inc2
2 files changed, 0 insertions, 10 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d7c430a1e4..378601db0c 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -668,14 +668,6 @@ DISTRO_FEATURES ?= ""
668# This is used to limit what packages goes into images built, so set big by default 668# This is used to limit what packages goes into images built, so set big by default
669ROOT_FLASH_SIZE ?= "256" 669ROOT_FLASH_SIZE ?= "256"
670 670
671MACHINE_GUI_CLASS ?= "smallscreen"
672# GUI_MACHINE_CLASS is deprecated, please use MACHINE_GUI_CLASS instead
673GUI_MACHINE_CLASS ?= "${MACHINE_GUI_CLASS}"
674MACHINE_DISPLAY_WIDTH_PIXELS ?= "240"
675MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320"
676MACHINE_DISPLAY_ORIENTATION ?= "0"
677MACHINE_DISPLAY_BPP ?= "16"
678
679DISTRO_EXTRA_RDEPENDS ?= "" 671DISTRO_EXTRA_RDEPENDS ?= ""
680DISTRO_EXTRA_RRECOMMENDS ?= "" 672DISTRO_EXTRA_RRECOMMENDS ?= ""
681MACHINE_EXTRA_RDEPENDS ?= "" 673MACHINE_EXTRA_RDEPENDS ?= ""
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index bd409830e8..40723ebf71 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -1,7 +1,5 @@
1PCMCIA_MANAGER = "pcmciautils" 1PCMCIA_MANAGER = "pcmciautils"
2PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" 2PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
3GUI_MACHINE_CLASS = "bigscreen"
4GPE_EXTRA_INSTALL += "gaim sylpheed"
5 3
6MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" 4MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
7 5