From patchwork Fri Jan  6 23:45:48 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Remove last remnants of kernel26 MACHINE_FEATURES
Date: Fri, 06 Jan 2012 23:45:48 -0000
From: Steve Sakoman <sakoman@gmail.com>
X-Patchwork-Id: 18709
Message-Id: <CAGDS+nm0tC4ZXPcL-VRGvA0qy+9WOU36+85Jhon6Dwq948pfqQ@mail.gmail.com>
To: Patches and discussions about the oe-core layer
	<openembedded-core@lists.openembedded.org>

There is really no reason to continue to carry this feature

Signed-off-by: Steve Sakoman <steve@sakoman.com>

---
Note: bsp layer maintainers may want to remove kernel26 references
from their machine.conf files

 SRC_URI = "file://update-modules \
            file://COPYING.GPL"

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1c21616..5f75ddf 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -692,7 +692,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 3cebfab..10ab76e 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 1ea97a8..dc44965 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"