summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/bitbake.conf1
-rw-r--r--meta/conf/machine/include/qemu.inc2
-rw-r--r--meta/recipes-kernel/update-modules/update-modules_1.0.bb4
3 files changed, 3 insertions, 4 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
diff --git a/meta/recipes-kernel/update-modules/update-modules_1.0.bb b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
index 1ea97a8530..dc4496507e 100644
--- a/meta/recipes-kernel/update-modules/update-modules_1.0.bb
+++ b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
@@ -3,8 +3,8 @@ SECTION = "base"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" 4LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
5 5
6RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " 6RDEPENDS_${PN} = "module-init-tools-depmod"
7PR = "r10" 7PR = "r11"
8 8
9SRC_URI = "file://update-modules \ 9SRC_URI = "file://update-modules \
10 file://COPYING.GPL" 10 file://COPYING.GPL"