summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorSteve Sakoman <steve@sakoman.com>2012-01-06 20:51:51 -0800
committerSaul Wold <sgw@linux.intel.com>2012-01-09 21:51:50 -0800
commitf1193e077d187b9ce18ae0686b1a1f0f9832036d (patch)
treeb95f05b681868393ee3ee8d7a06d95028d6c1af1 /meta
parent4fa337fe932230b43d7006cdd8b44dfa05501bbe (diff)
downloadopenembedded-core-f1193e077d187b9ce18ae0686b1a1f0f9832036d.tar.gz
openembedded-core-f1193e077d187b9ce18ae0686b1a1f0f9832036d.tar.bz2
openembedded-core-f1193e077d187b9ce18ae0686b1a1f0f9832036d.tar.xz
openembedded-core-f1193e077d187b9ce18ae0686b1a1f0f9832036d.zip
Remove last remnants of kernel26 MACHINE_FEATURES
There is no reason to continue to carry this feature Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
-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 b8583646a..336b1d706 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -685,7 +685,6 @@ OES_BITBAKE_CONF = "1"
# Machine properties and task-base stuff
##################################################################
-MACHINE_FEATURES ?= "kernel26"
DISTRO_FEATURES ?= ""
# 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 3cebfab66..10ab76ed6 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -1,7 +1,7 @@
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
+MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen"
IMAGE_FSTYPES ?= "tar.bz2 ext3"
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 1ea97a853..dc4496507 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"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
-RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} "
-PR = "r10"
+RDEPENDS_${PN} = "module-init-tools-depmod"
+PR = "r11"
SRC_URI = "file://update-modules \
file://COPYING.GPL"