Koen Kooi wrote:
Op 8 jun 2008, om 17:45 heeft Helge Deller het volgende geschreven:

I'd like to propose to include the attached patch to 2007.12 r16.
It's a backport of the .dev branch and enables the image for Poodle to include the drivers for cs and pcmcia so that pcmcia and wifi cards can work out of the box

This patch won't work, because:

Here you modify task-base related stuff:

-MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
+MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"


But no PR bump in task-base, only in the kernel, that already builds those modules:

Yes. I didn't included it, since I was under the impression that the person who would commit it would bump task-base then as well anyway.

New patch attached below.
(Isn't patch to task-boot then needed as well? I didn't checked, as I always remove the stamps manually...)

Helge


============================================================
--- packages/linux/linux-rp_2.6.24.bb 22744ff19fcffdfc2e902231a82b3aa85dc5c06c +++ packages/linux/linux-rp_2.6.24.bb c8896674cb15d4027e727de269a2c478534ca4d3
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc

-PR = "r9"
+PR = "r10"

DEFAULT_PREFERENCE = "-1"
#DEFAULT_PREFERENCE_collie = "1"

#
# old_revision [4cd0be119f68bfd70fb48fb43e13b4b4e7b7524f]
#
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [7ecb352669b5b71228489192cdeb5826dc02b46a]
#    to [f21df9dabb110dba413eec0c81e21d1b097a5756]
# 
# patch "packages/linux/linux-rp_2.6.24.bb"
#  from [22744ff19fcffdfc2e902231a82b3aa85dc5c06c]
#    to [c8896674cb15d4027e727de269a2c478534ca4d3]
# 
# patch "packages/tasks/task-base.bb"
#  from [47914cc275060af9ade4a3f8bec2034b23a9e7c6]
#    to [3846bc90772f8374ce01dcb4d89aa7272466eee0]
#
============================================================
--- conf/machine/include/zaurus-2.6.inc	7ecb352669b5b71228489192cdeb5826dc02b46a
+++ conf/machine/include/zaurus-2.6.inc	f21df9dabb110dba413eec0c81e21d1b097a5756
@@ -35,7 +35,7 @@ MACHINE_EXTRA_RRECOMMENDS_spitz  = "kern
 MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
-MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
+MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
 
 GUI_MACHINE_CLASS = "bigscreen"
 GUI_MACHINE_CLASS_collie = "smallscreen"
============================================================
--- packages/linux/linux-rp_2.6.24.bb	22744ff19fcffdfc2e902231a82b3aa85dc5c06c
+++ packages/linux/linux-rp_2.6.24.bb	c8896674cb15d4027e727de269a2c478534ca4d3
@@ -1,6 +1,6 @@ require linux-rp.inc
 require linux-rp.inc
 
-PR = "r9"
+PR = "r10"
 
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE_collie = "1"
============================================================
--- packages/tasks/task-base.bb	47914cc275060af9ade4a3f8bec2034b23a9e7c6
+++ packages/tasks/task-base.bb	3846bc90772f8374ce01dcb4d89aa7272466eee0
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r63"
+PR = "r64"
 
 inherit task
 
_______________________________________________
Openembedded-stablebranch mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-stablebranch

Reply via email to