[PATCH v6 0/2] Linux 3.0 build support

[PATCH v6 0/2] Linux 3.0 build support

[Anders Darander]

v6: All patches from v5 has been applied, apart from one. (patch 0001 in this
    series)
    - Updated the patch in question with the comments from v5. (HOTPLUG and
    PCMCIA_MANAGER related changes).
    - Added a patch to remove kernel-module-rtc-sa1100 from task-base. No
    patch supplied to add kernel-module-rtc-sa1100 to the affected
    machines. Thus, this patch can be dropped, if it risks too much.


===============

This patch series is the continuation of the series adding kernel 3.0 support
to oe-core. One patch from the original series were not applied to master by
mistake (patch 0001 in this continuation).

The second patch is to remove machine specific features from task-base, as
suggested in a comment to v5 of patch 0001. However, the rtc-module in
question, has not been added to the affected machines. 

Even if patch 0002 is not applied (as the affected machines are not fixed), I
think that patch 0001 should be applied.

Regards,
Anders


The following changes since commit f05b7ee7716d1e5cc1ba0bbab57e91c3a0569e9e:

  x-load: Update to 1.5.0 (2011-07-05 14:16:33 +0100)

are available in the git repository at:
  git://github.com/darander/oe-core kernel-3.0
  https://github.com/darander/oe-core/tree/kernel-3.0

Anders Darander (2):
  task-base: remove modutils reference.
  task-base: remove unconditional inclusion of kernel-module-rtc-sa1100

 meta/recipes-core/tasks/task-base.bb |   59 ++++++++--------------------------
 1 files changed, 14 insertions(+), 45 deletions(-)

-- 
1.7.4.1

[PATCH v6 1/2] task-base: remove modutils reference.

[Anders Darander]

Also remove the other kernel24 references.
Make everything dependent on kernel26 default.
Move the RDEPENDS- and RRECOMMENDS_task-base-kernel26 to _task-base.

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta/recipes-core/tasks/task-base.bb |   60 ++++++++-------------------------
 1 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index 3ff57ff..527bc6d 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/p
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r71"
+PR = "r72"
 
 inherit task
 
@@ -45,7 +45,6 @@ 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)} \
             '
 
 ALLOW_EMPTY = "1"
@@ -56,16 +55,6 @@ ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 #
-# linux-hotplug or none
-#
-HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24",  "linux-hotplug","",d)} "
-
-#
-# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
-#
-PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
-
-#
 # those ones can be set in machine config to supply packages needed to get machine booting
 #
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
@@ -77,9 +66,9 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 RDEPENDS_task-base = "\
     task-distro-base \
     task-machine-base \
-    ${HOTPLUG} \
     \
-    ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \
+    sysfsutils \
+    module-init-tools \
     ${@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)} \
@@ -112,6 +101,17 @@ RDEPENDS_task-base = "\
     "
 # bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in
 
+
+RRECOMMENDS_task-base = "\
+    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"
+
 RDEPENDS_task-base-extended = "\
     task-base \
     ${ADD_WIFI} \
@@ -155,27 +155,6 @@ 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 \
-    kernel-module-uinput \
-    kernel-module-rtc-dev \
-    kernel-module-rtc-proc \
-    kernel-module-rtc-sysfs \
-    kernel-module-rtc-sa1100 \
-    kernel-module-unix"
-
 RDEPENDS_task-base-keyboard = "\
     keymaps"
 
@@ -214,28 +193,19 @@ RRECOMMENDS_task-base-alsa = "\
     kernel-module-snd-pcm-oss"
 
 RDEPENDS_task-base-pcmcia = "\
-    ${PCMCIA_MANAGER} \
+    pcmciautils \
     "
 #${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)}
 #${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)}
 
 
 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

[PATCH v6 2/2] task-base: remove unconditional inclusion of kernel-module-rtc-sa1100

[Anders Darander]

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta/recipes-core/tasks/task-base.bb |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index 527bc6d..97a854c 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -109,7 +109,6 @@ RRECOMMENDS_task-base = "\
     kernel-module-rtc-dev \
     kernel-module-rtc-proc \
     kernel-module-rtc-sysfs \
-    kernel-module-rtc-sa1100 \
     kernel-module-unix"
 
 RDEPENDS_task-base-extended = "\
-- 
1.7.4.1

Re: [PATCH v6 0/2] Linux 3.0 build support

[Richard Purdie]

On Wed, 2011-07-06 at 08:31 +0200, Anders Darander wrote:
> v6: All patches from v5 has been applied, apart from one. (patch 0001 in this
>     series)
>     - Updated the patch in question with the comments from v5. (HOTPLUG and
>     PCMCIA_MANAGER related changes).
>     - Added a patch to remove kernel-module-rtc-sa1100 from task-base. No
>     patch supplied to add kernel-module-rtc-sa1100 to the affected
>     machines. Thus, this patch can be dropped, if it risks too much.
> 
> 
> ===============
> 
> This patch series is the continuation of the series adding kernel 3.0 support
> to oe-core. One patch from the original series were not applied to master by
> mistake (patch 0001 in this continuation).
> 
> The second patch is to remove machine specific features from task-base, as
> suggested in a comment to v5 of patch 0001. However, the rtc-module in
> question, has not been added to the affected machines. 
> 
> Even if patch 0002 is not applied (as the affected machines are not fixed), I
> think that patch 0001 should be applied.
> 
> Regards,
> Anders
> 
> 
> The following changes since commit f05b7ee7716d1e5cc1ba0bbab57e91c3a0569e9e:
> 
>   x-load: Update to 1.5.0 (2011-07-05 14:16:33 +0100)
> 
> are available in the git repository at:
>   git://github.com/darander/oe-core kernel-3.0
>   https://github.com/darander/oe-core/tree/kernel-3.0
> 
> Anders Darander (2):
>   task-base: remove modutils reference.
>   task-base: remove unconditional inclusion of kernel-module-rtc-sa1100

Merged to master, thanks.

The affected PXA/SA1100 machines will just have to catch up with the rtc
change...

Cheers,

Richard