Patchwork [v2] Remove last remnants of kernel26 MACHINE_FEATURES

login
register
mail settings
Submitter Steve Sakoman
Date Jan. 7, 2012, 4:51 a.m.
Message ID <1325911915-16001-1-git-send-email-steve@sakoman.com>
Download mbox | patch
Permalink /patch/18753/
State Accepted
Commit f1193e077d187b9ce18ae0686b1a1f0f9832036d
Headers show

Comments

Steve Sakoman - Jan. 7, 2012, 4:51 a.m.
There is no reason to continue to carry this feature

Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/conf/bitbake.conf                             |    1 -
 meta/conf/machine/include/qemu.inc                 |    2 +-
 .../update-modules/update-modules_1.0.bb           |    4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)
Saul Wold - Jan. 12, 2012, 6:26 a.m.
On 01/06/2012 08:51 PM, Steve Sakoman wrote:
> There is no reason to continue to carry this feature
>
> Signed-off-by: Steve Sakoman<steve@sakoman.com>
> ---
>   meta/conf/bitbake.conf                             |    1 -
>   meta/conf/machine/include/qemu.inc                 |    2 +-
>   .../update-modules/update-modules_1.0.bb           |    4 ++--
>   3 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index b858364..336b1d7 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 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"
>
>   SRC_URI = "file://update-modules \
>              file://COPYING.GPL"

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b858364..336b1d7 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 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"
 
 SRC_URI = "file://update-modules \
            file://COPYING.GPL"