* [PATCH 1/3] meta-yocto: atom-pc/mpc8315e-rdb change preferred version to 3.0
2011-08-24 20:54 [PATCH 0/3] linux-yocto/meta-yocto: consolidated kernel pull request Bruce Ashfield
@ 2011-08-24 20:54 ` Bruce Ashfield
2011-08-24 20:54 ` [PATCH 2/3] linux-yocto/meta-yocto: update SRCREVs for 3.0.3 and consolidated fixes Bruce Ashfield
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2011-08-24 20:54 UTC (permalink / raw)
To: richard.purdie; +Cc: poky, saul.wold
Updating two more yocto hardware reference platforms to use the
3.0 kernel by default.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta-yocto/conf/machine/atom-pc.conf | 1 +
meta-yocto/conf/machine/mpc8315e-rdb.conf | 4 +++-
.../recipes-kernel/linux/linux-yocto_3.0.bbappend | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf
index a0a8104..da795cd 100644
--- a/meta-yocto/conf/machine/atom-pc.conf
+++ b/meta-yocto/conf/machine/atom-pc.conf
@@ -11,6 +11,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
KERNEL_IMAGETYPE = "bzImage"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.0%"
#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
diff --git a/meta-yocto/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf
index c237609..d67dc18 100644
--- a/meta-yocto/conf/machine/mpc8315e-rdb.conf
+++ b/meta-yocto/conf/machine/mpc8315e-rdb.conf
@@ -11,7 +11,9 @@ SERIAL_CONSOLE = "115200 ttyS0"
MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.0%"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+
#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
XSERVER = "xserver-kdrive-fbdev"
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
index ef580a5..e224d80 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -9,7 +9,7 @@ SRCREV_machine_routerstationpro = "fd6d538850a28413e3c4867b905c56039773df3a"
SRCREV_machine_mpc8315e-rdb = "5d3c0b06071abd663c7790df141060ae462660a9"
SRCREV_machine_beagleboard = "32631d785b0b907e5c14435ef7531ed041ab8c64"
-# COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
+COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
# COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
# COMPATIBLE_MACHINE_beagleboard = "beagleboard"
-# COMPATIBLE_MACHINE_atom-pc = "atom-pc"
+COMPATIBLE_MACHINE_atom-pc = "atom-pc"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] linux-yocto/meta-yocto: update SRCREVs for 3.0.3 and consolidated fixes
2011-08-24 20:54 [PATCH 0/3] linux-yocto/meta-yocto: consolidated kernel pull request Bruce Ashfield
2011-08-24 20:54 ` [PATCH 1/3] meta-yocto: atom-pc/mpc8315e-rdb change preferred version to 3.0 Bruce Ashfield
@ 2011-08-24 20:54 ` Bruce Ashfield
2011-08-24 20:54 ` [PATCH 3/3] meta-yocto: make qemu machines prefer linux-yocto_3.0 Bruce Ashfield
2011-08-25 1:30 ` [PATCH 0/3] linux-yocto/meta-yocto: consolidated kernel pull request Richard Purdie
3 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2011-08-24 20:54 UTC (permalink / raw)
To: richard.purdie; +Cc: poky, saul.wold
Updating the SRCREVs to pickup the kernel.org -stable update for
3.0.3 and to pickup fixes done in standard for oe-core supported
machines.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
.../recipes-kernel/linux/linux-yocto_3.0.bbappend | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
index e224d80..52ff1a2 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -3,11 +3,11 @@ KMACHINE_routerstationpro = "yocto/standard/routerstationpro"
KMACHINE_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb"
KMACHINE_beagleboard = "yocto/standard/beagleboard"
-SRCREV_machine_emenlow = "374340f311d7b035451f45e29bab5e1b8c058ce8"
-SRCREV_machine_atom-pc = "fdd23ed909594ba6c32c894ee6536cf823b0377f"
-SRCREV_machine_routerstationpro = "fd6d538850a28413e3c4867b905c56039773df3a"
-SRCREV_machine_mpc8315e-rdb = "5d3c0b06071abd663c7790df141060ae462660a9"
-SRCREV_machine_beagleboard = "32631d785b0b907e5c14435ef7531ed041ab8c64"
+SRCREV_machine_emenlow ?= "985f4b7b1df7e4dbfd73af8312f544a9fcd537e7"
+SRCREV_machine_atom-pc ?= "ead7d8334e4c075906d029789333f43e54f6257a"
+SRCREV_machine_routerstationpro ?= "81d3603cf9354533f8a747b9cf9be721cb70d4fb"
+SRCREV_machine_mpc8315e-rdb ?= "59503eebe7ad5951973be8bc66eeeb98cf98193a"
+SRCREV_machine_beagleboard ?= "73d4dce6a853bab7e943a5d7eee67e593f259ecf"
COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
# COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] meta-yocto: make qemu machines prefer linux-yocto_3.0
2011-08-24 20:54 [PATCH 0/3] linux-yocto/meta-yocto: consolidated kernel pull request Bruce Ashfield
2011-08-24 20:54 ` [PATCH 1/3] meta-yocto: atom-pc/mpc8315e-rdb change preferred version to 3.0 Bruce Ashfield
2011-08-24 20:54 ` [PATCH 2/3] linux-yocto/meta-yocto: update SRCREVs for 3.0.3 and consolidated fixes Bruce Ashfield
@ 2011-08-24 20:54 ` Bruce Ashfield
2011-08-25 1:30 ` [PATCH 0/3] linux-yocto/meta-yocto: consolidated kernel pull request Richard Purdie
3 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2011-08-24 20:54 UTC (permalink / raw)
To: richard.purdie; +Cc: poky, saul.wold
Since there aren't individual qemu*.conf files in meta-yocto the
qemu machines follow the default preference in poky.conf, which is
the 2.6.37 kernel. Rather than introducing new .conf files just for
this adding machine specific overrides is lower footprint.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta-yocto/conf/distro/poky.conf | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index c65cbc4..c5fc3b9 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -13,6 +13,11 @@ LOCALCONF_VERSION = "1"
DISTRO_FEATURES_append = " largefile opengl"
PREFERRED_VERSION_linux-yocto ?= "2.6.37+git%"
+PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.0%"
+PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.0%"
+PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.0%"
+PREFERRED_VERSION_linux-yocto_qemumips ?= "3.0%"
+PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.0%"
SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/3] linux-yocto/meta-yocto: consolidated kernel pull request
2011-08-24 20:54 [PATCH 0/3] linux-yocto/meta-yocto: consolidated kernel pull request Bruce Ashfield
` (2 preceding siblings ...)
2011-08-24 20:54 ` [PATCH 3/3] meta-yocto: make qemu machines prefer linux-yocto_3.0 Bruce Ashfield
@ 2011-08-25 1:30 ` Richard Purdie
2011-08-25 1:51 ` Bruce Ashfield
3 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2011-08-25 1:30 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: poky, saul.wold
On Wed, 2011-08-24 at 16:54 -0400, Bruce Ashfield wrote:
> These changes build on top of the recently sent pull request for
> the core machines.
>
> This set of changes updates the preferred version for two more hardware
> references (atom-pc/mpc8315) to 3.0 and ensure that the qemu machines
> build 3.0 by default when meta-yocto is included. Let me know if my
> efforts to force the qemu machines to prefer 3.0 are correct, I wasn't
> sure if there was a better approach.
>
> The following changes since commit 6d0f1146b188f7efffc46477590b3b5615ae3035:
>
> linux-yocto/2.6.37: apmd + get time of day fixes (2011-08-24 16:33:07 -0400)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib kernel-yocto
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-yocto
>
> Bruce Ashfield (3):
> meta-yocto: atom-pc/mpc8315e-rdb change preferred version to 3.0
> linux-yocto/meta-yocto: update SRCREVs for 3.0.3 and consolidated
> fixes
> meta-yocto: make qemu machines prefer linux-yocto_3.0
The push command you used for this series had the same issue as the
other one, lacking a prefix ;-)
Merged to master though, thanks.
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 0/3] linux-yocto/meta-yocto: consolidated kernel pull request
2011-08-25 1:30 ` [PATCH 0/3] linux-yocto/meta-yocto: consolidated kernel pull request Richard Purdie
@ 2011-08-25 1:51 ` Bruce Ashfield
0 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2011-08-25 1:51 UTC (permalink / raw)
To: Richard Purdie; +Cc: poky, saul.wold
On 11-08-24 9:30 PM, Richard Purdie wrote:
> On Wed, 2011-08-24 at 16:54 -0400, Bruce Ashfield wrote:
>> These changes build on top of the recently sent pull request for
>> the core machines.
>>
>> This set of changes updates the preferred version for two more hardware
>> references (atom-pc/mpc8315) to 3.0 and ensure that the qemu machines
>> build 3.0 by default when meta-yocto is included. Let me know if my
>> efforts to force the qemu machines to prefer 3.0 are correct, I wasn't
>> sure if there was a better approach.
>>
>> The following changes since commit 6d0f1146b188f7efffc46477590b3b5615ae3035:
>>
>> linux-yocto/2.6.37: apmd + get time of day fixes (2011-08-24 16:33:07 -0400)
>>
>> are available in the git repository at:
>> git://git.pokylinux.org/poky-contrib kernel-yocto
>> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-yocto
>>
>> Bruce Ashfield (3):
>> meta-yocto: atom-pc/mpc8315e-rdb change preferred version to 3.0
>> linux-yocto/meta-yocto: update SRCREVs for 3.0.3 and consolidated
>> fixes
>> meta-yocto: make qemu machines prefer linux-yocto_3.0
>
> The push command you used for this series had the same issue as the
> other one, lacking a prefix ;-)
>
> Merged to master though, thanks.
*sigh* good help is hard to find.
Bruce
>
> Richard
>
^ permalink raw reply [flat|nested] 6+ messages in thread