Patchwork [v4,7/8] task-base: remove modutils reference.

login
register
mail settings
Submitter Anders Darander
Date July 1, 2011, 7:06 a.m.
Message ID <cf740fbc1c5f26487e14e8959cfc13f085ff95ff.1309503939.git.anders@chargestorm.se>
Download mbox | patch
Permalink /patch/6811/
State Superseded
Headers show

Comments

Anders Darander - July 1, 2011, 7:06 a.m.
Also remove the other kernel24 references.
Make everything dependent on kernel26 default.

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta/recipes-core/tasks/task-base.bb |   24 ++++--------------------
 1 files changed, 4 insertions(+), 20 deletions(-)
Koen Kooi - July 1, 2011, 7:20 a.m.
Op 1 jul 2011, om 09:06 heeft Anders Darander het volgende geschreven:

> Also remove the other kernel24 references.
> Make everything dependent on kernel26 default.

Since there will be only one of each, can we just completely scrap there variables and put the items directly in the tasks?

regards,

Koen

> Signed-off-by: Anders Darander <anders@chargestorm.se>
> ---
> meta/recipes-core/tasks/task-base.bb |   24 ++++--------------------
> 1 files changed, 4 insertions(+), 20 deletions(-)
> 
> diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
> index 3ff57ff..62432b4 100644
> --- a/meta/recipes-core/tasks/task-base.bb
> +++ b/meta/recipes-core/tasks/task-base.bb
> @@ -45,7 +45,7 @@ PACKAGES = ' \
>             ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \
>             ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf", "", d)} \
>             \
> -            ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
> +            task-base-kernel26 \
>             '
> 
> ALLOW_EMPTY = "1"
> @@ -58,12 +58,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
> #
> # linux-hotplug or none
> #
> -HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24",  "linux-hotplug","",d)} "
> +HOTPLUG ?= ""
> 
> #
> # pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
> #
> -PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
> +PCMCIA_MANAGER ?= "pcmciautils"
> 
> #
> # those ones can be set in machine config to supply packages needed to get machine booting
> @@ -79,7 +79,7 @@ RDEPENDS_task-base = "\
>     task-machine-base \
>     ${HOTPLUG} \
>     \
> -    ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \
> +    task-base-kernel26 \
>     ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \
>     ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \
>     ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \
> @@ -155,17 +155,10 @@ RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
> RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
> RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
> 
> -RDEPENDS_task-base-kernel24 = "\
> -    modutils-depmod"
> -
> RDEPENDS_task-base-kernel26 = "\
>     sysfsutils \
>     module-init-tools"
> 
> -RRECOMMENDS_task-base-kernel24 = "\
> -    kernel-module-input \
> -    kernel-module-uinput"
> -
> RRECOMMENDS_task-base-kernel26 = "\
>     kernel-module-nls-utf8 \
>     kernel-module-input \
> @@ -221,21 +214,12 @@ RDEPENDS_task-base-pcmcia = "\
> 
> 
> RRECOMMENDS_task-base-pcmcia = "\
> -    ${@base_contains('MACHINE_FEATURES', 'kernel26', '${task-base-pcmcia26}', '${task-base-pcmcia24}',d)} \
>     kernel-module-pcmcia \
>     kernel-module-airo-cs \
>     kernel-module-pcnet-cs \
>     kernel-module-serial-cs \
>     kernel-module-ide-cs \
>     kernel-module-ide-disk \
> -    "
> -
> -task-base-pcmcia24 = "\
> -    ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-modules-cs', '',d)} \
> -    ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-modules-cs', '',d)} \
> -    "
> -
> -task-base-pcmcia26 = "\
>     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
>     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
>     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Anders Darander - July 1, 2011, 11:52 a.m.
* Koen Kooi Koen Kooi <koen@dominion.thruhere.net> [07/01/11 09:20 AM]:
> Op 1 jul 2011, om 09:06 heeft Anders Darander het volgende geschreven:
> > Also remove the other kernel24 references.
> > Make everything dependent on kernel26 default.
> 
> Since there will be only one of each, can we just completely scrap there
> variables and put the items directly in the tasks?

Sure, we could do that.

One question though, how should I treat 

RRECOMMENDS_task-base-kernel26 = "\
    kernel-module-nls-utf8 \
    kernel-module-input \
    kernel-module-uinput \
    kernel-module-rtc-dev \
    kernel-module-rtc-proc \
    kernel-module-rtc-sysfs \
    kernel-module-rtc-sa1100 \
    kernel-module-unix"

from task-base.bb? Should that part just be new, general
RRECOMMENDS = "\
    kernel-module-nls-utf8 \
    kernel-module-input \
    kernel-module-uinput \
    kernel-module-rtc-dev \
    kernel-module-rtc-proc \
    kernel-module-rtc-sysfs \
    kernel-module-rtc-sa1100 \
    kernel-module-unix"?

I guess that's the right thing, and I'll create a new pull request with that 
merged into the last patch.

Regards,
Anders
Koen Kooi - July 1, 2011, 12:05 p.m.
Op 1 jul 2011, om 13:52 heeft Anders Darander het volgende geschreven:

> 
> * Koen Kooi Koen Kooi <koen@dominion.thruhere.net> [07/01/11 09:20 AM]:
>> Op 1 jul 2011, om 09:06 heeft Anders Darander het volgende geschreven:
>>> Also remove the other kernel24 references.
>>> Make everything dependent on kernel26 default.
>> 
>> Since there will be only one of each, can we just completely scrap there
>> variables and put the items directly in the tasks?
> 
> Sure, we could do that.
> 
> One question though, how should I treat 
> 
> RRECOMMENDS_task-base-kernel26 = "\
>    kernel-module-nls-utf8 \
>    kernel-module-input \
>    kernel-module-uinput \
>    kernel-module-rtc-dev \
>    kernel-module-rtc-proc \
>    kernel-module-rtc-sysfs \
>    kernel-module-rtc-sa1100 \
>    kernel-module-unix"
> 
> from task-base.bb? Should that part just be new, general
> RRECOMMENDS = "\
>    kernel-module-nls-utf8 \
>    kernel-module-input \
>    kernel-module-uinput \
>    kernel-module-rtc-dev \
>    kernel-module-rtc-proc \
>    kernel-module-rtc-sysfs \
>    kernel-module-rtc-sa1100 \
>    kernel-module-unix"?
> 
> I guess that's the right thing, and I'll create a new pull request with that 
> merged into the last patch.

The above is what I had in mind, but I do question the need for rtc-sa1100 in task-base, that should be in the machine.conf as MACHINE_EXTRA_RRECOMMENDS or so. But that is outside the scope of this patch I guess.

regards,

Koen
Anders Darander - July 1, 2011, 12:07 p.m.
* Anders Darander Anders Darander <anders@chargestorm.se> [07/01/11 01:52 PM]:

> from task-base.bb? Should that part just be new, general
> RRECOMMENDS = "\
>     kernel-module-nls-utf8 \

I should have written:

RRECOMMENDS_task-base = "\
    kernel-module-nls-utf8 \

Regards,
Anders
Richard Purdie - July 1, 2011, 10:37 p.m.
On Fri, 2011-07-01 at 14:05 +0200, Koen Kooi wrote:
> Op 1 jul 2011, om 13:52 heeft Anders Darander het volgende geschreven:
> 
> > 
> > * Koen Kooi Koen Kooi <koen@dominion.thruhere.net> [07/01/11 09:20 AM]:
> >> Op 1 jul 2011, om 09:06 heeft Anders Darander het volgende geschreven:
> >>> Also remove the other kernel24 references.
> >>> Make everything dependent on kernel26 default.
> >> 
> >> Since there will be only one of each, can we just completely scrap there
> >> variables and put the items directly in the tasks?
> > 
> > Sure, we could do that.
> > 
> > One question though, how should I treat 
> > 
> > RRECOMMENDS_task-base-kernel26 = "\
> >    kernel-module-nls-utf8 \
> >    kernel-module-input \
> >    kernel-module-uinput \
> >    kernel-module-rtc-dev \
> >    kernel-module-rtc-proc \
> >    kernel-module-rtc-sysfs \
> >    kernel-module-rtc-sa1100 \
> >    kernel-module-unix"
> > 
> > from task-base.bb? Should that part just be new, general
> > RRECOMMENDS = "\
> >    kernel-module-nls-utf8 \
> >    kernel-module-input \
> >    kernel-module-uinput \
> >    kernel-module-rtc-dev \
> >    kernel-module-rtc-proc \
> >    kernel-module-rtc-sysfs \
> >    kernel-module-rtc-sa1100 \
> >    kernel-module-unix"?
> > 
> > I guess that's the right thing, and I'll create a new pull request with that 
> > merged into the last patch.
> 
> The above is what I had in mind, but I do question the need for
> rtc-sa1100 in task-base, that should be in the machine.conf as
> MACHINE_EXTRA_RRECOMMENDS or so. But that is outside the scope of this
> patch I guess.

Agreed, rtc-sa1100 shouldn't be there and I don't know how that
happened :/. I'll take patches to resolve that.

Cheers,

Richard

Patch

diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index 3ff57ff..62432b4 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -45,7 +45,7 @@  PACKAGES = ' \
             ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \
             ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf", "", d)} \
             \
-            ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
+            task-base-kernel26 \
             '
 
 ALLOW_EMPTY = "1"
@@ -58,12 +58,12 @@  PACKAGE_ARCH = "${MACHINE_ARCH}"
 #
 # linux-hotplug or none
 #
-HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24",  "linux-hotplug","",d)} "
+HOTPLUG ?= ""
 
 #
 # pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
 #
-PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
+PCMCIA_MANAGER ?= "pcmciautils"
 
 #
 # those ones can be set in machine config to supply packages needed to get machine booting
@@ -79,7 +79,7 @@  RDEPENDS_task-base = "\
     task-machine-base \
     ${HOTPLUG} \
     \
-    ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \
+    task-base-kernel26 \
     ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \
     ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \
     ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \
@@ -155,17 +155,10 @@  RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
 RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
 RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
 
-RDEPENDS_task-base-kernel24 = "\
-    modutils-depmod"
-
 RDEPENDS_task-base-kernel26 = "\
     sysfsutils \
     module-init-tools"
 
-RRECOMMENDS_task-base-kernel24 = "\
-    kernel-module-input \
-    kernel-module-uinput"
-
 RRECOMMENDS_task-base-kernel26 = "\
     kernel-module-nls-utf8 \
     kernel-module-input \
@@ -221,21 +214,12 @@  RDEPENDS_task-base-pcmcia = "\
 
 
 RRECOMMENDS_task-base-pcmcia = "\
-    ${@base_contains('MACHINE_FEATURES', 'kernel26', '${task-base-pcmcia26}', '${task-base-pcmcia24}',d)} \
     kernel-module-pcmcia \
     kernel-module-airo-cs \
     kernel-module-pcnet-cs \
     kernel-module-serial-cs \
     kernel-module-ide-cs \
     kernel-module-ide-disk \
-    "
-
-task-base-pcmcia24 = "\
-    ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-modules-cs', '',d)} \
-    ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-modules-cs', '',d)} \
-    "
-
-task-base-pcmcia26 = "\
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"