summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf1
-rw-r--r--meta/conf/machine/include/qemu.inc2
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b8583646a0..336b1d7062 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -685,7 +685,6 @@ OES_BITBAKE_CONF = "1"
685# Machine properties and task-base stuff 685# Machine properties and task-base stuff
686################################################################## 686##################################################################
687 687
688MACHINE_FEATURES ?= "kernel26"
689DISTRO_FEATURES ?= "" 688DISTRO_FEATURES ?= ""
690 689
691# This is used to limit what packages goes into images built, so set big by default 690# This is used to limit what packages goes into images built, so set big by default
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 3cebfab669..10ab76ed6b 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -1,7 +1,7 @@
1PCMCIA_MANAGER = "pcmciautils" 1PCMCIA_MANAGER = "pcmciautils"
2PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" 2PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
3 3
4MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" 4MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen"
5 5
6IMAGE_FSTYPES ?= "tar.bz2 ext3" 6IMAGE_FSTYPES ?= "tar.bz2 ext3"
7 7