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>

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b8583646a05771407847295a432f439d56cb4538..336b1d706287afb5f1fe823e173738380f2838bd 100644 (file)
--- 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 3cebfab669ca6f8ccda22a2929da6f911ff5abc2..10ab76ed6b989a5435f0b538f0cdf3ac5352c725 100644 (file)
--- 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 1ea97a85300dc4fc3bcd65d26f1df188f256db55..dc4496507efebfbd46d961aecd158dcc3a62a26b 100644 (file)
--- 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"