[PATCH] Remove last remnants of kernel26 MACHINE_FEATURES
DORMANTno replies
From: Steve Sakoman <sakoman@gmail.com>
Date: 2012-01-06 23:53:24
Subsystem:
the rest · Maintainer:
Linus Torvalds
There is really no reason to continue to carry this feature Signed-off-by: Steve Sakoman <redacted> --- Note: bsp layer maintainers may want to remove kernel26 references from their machine.conf files
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.incb/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.bbb/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"
SRC_URI = "file://update-modules \
file://COPYING.GPL"