linux-yocto: consolidated pull request

PATCH Applied Bruce Ashfield 2 participants 5 messages Sep 14, 2011 – Sep 15, 2011

lore

Share & tools

lore

Bruce Ashfield

author

2011-09-14 18:16 UTC #0 lore raw

cover linux-yocto: consolidated pull request

Richard/Saul,

Here's a series of changes I've had locally since last week. The two kernel only ones are simple enough.

- a configuration split to clean our x86 BSPs
- a build fix for rt

The net result of the cleanup is zero, since the configs are the same, so there's no reason not to do it.

I've also had the refactored linux-yocto tasks around for a bit, they were brought up while reviewing some 1.1 documentation, and indeed, simplifying the amount of variables required in a linux-yocto based recipe was a 1.1 goal. The result here is also zero, since we are just not resetting things needlessly. I've been building with this for a while, but if you'd rather sit on this until the imminent spin is done, I won't object.

The following changes since commit ce66e2c6bd117d1a40b547b10b376524f9276d16:

core-image-minimal: Add missing POKY_EXTRA_IMAGE variable (2011-09-14 01:29:30 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (3):
linux-yocto: move common tasks to a common location
linux-yocto: split e100 and e1000 support
linux-yocto-rt: correct 3.0.3->3.0.4 mismerge for, stop_machine.c

 meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb |    8 +-------
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb    |   14 ++++----------
 meta/recipes-kernel/linux/linux-yocto.inc          |    5 +++++
 meta/recipes-kernel/linux/linux-yocto_2.6.37.bb    |   13 +------------
 meta/recipes-kernel/linux/linux-yocto_3.0.bb       |   10 ++--------
 5 files changed, 13 insertions(+), 37 deletions(-)

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2011-09-14 18:16 UTC #1 lore raw

PATCH 1/3 linux-yocto: move common tasks to a common location

During the initial development of the linux-yocto recipes there were several additional tasks that needed to be run in any inheriting recipe. At that time, they didn't seem to fire if they were in the include file versus the recipes themselves. As it turns out, these tasks do work fine if placed in the linux-yocto.inc file, and the rest of the recipes can be simplified as a result.

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb |    8 +-------
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb    |    8 +-------
 meta/recipes-kernel/linux/linux-yocto.inc          |    5 +++++
 meta/recipes-kernel/linux/linux-yocto_2.6.37.bb    |   13 +------------
 meta/recipes-kernel/linux/linux-yocto_3.0.bb       |    8 +-------
 5 files changed, 9 insertions(+), 33 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb +1 -7

index 0ca53ae..d92a902 100644
@@ -17,9 +17,8 @@ SRCREV_machine_qemux86-64 = "3c84c45ad3c3592f9c7ff4076de9bee417cd322e"
 SRCREV_machine = "439602eb6acd53d9beb8493710310214fc7bd749"
 SRCREV_meta = "e1f85a470934a0cf6abde5d95533e74501822c6b"
 
-PR = "r2"
+PR = "r3"
 PV = "${LINUX_VERSION}+git${SRCPV}"
-SRCREV_FORMAT = "meta_machine"
 
 COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"

@@ -34,11 +33,6 @@ python __anonymous () {
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.34.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta"
 
 # Functionality flags
-KERNEL_REVISION_CHECKING ?= "t"
 KERNEL_FEATURES=features/netfilter
 
-# extra tasks
-addtask kernel_link_vmlinux after do_compile before do_install
-addtask validate_branches before do_patch after do_kernel_checkout
-
 require recipes-kernel/linux/linux-tools.inc

meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +1 -7

index b296ef4..ebf6054 100644
@@ -18,9 +18,8 @@ SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3"
 SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af"
 SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7"
 
-PR = "r0"
+PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
-SRCREV_FORMAT = "meta_machine"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"

@@ -35,9 +34,4 @@ KERNEL_FEATURES_append=" features/taskstats"
 KERNEL_FEATURES_append_qemux86=" cfg/sound"
 KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
 
-# extra tasks
-addtask kernel_link_vmlinux after do_compile before do_install
-addtask validate_branches before do_patch after do_kernel_checkout
-addtask kernel_configcheck after do_configure before do_compile
-
 require recipes-kernel/linux/linux-tools.inc

meta/recipes-kernel/linux/linux-yocto.inc +5 -0

index 11b77ce..09433fa 100644
@@ -34,3 +34,8 @@ do_install_append(){
 		rm -rf ${STAGING_KERNEL_DIR}/${KMETA}
 	fi
 }
+
+# extra tasks
+addtask kernel_link_vmlinux after do_compile before do_install
+addtask validate_branches before do_patch after do_kernel_checkout
+addtask kernel_configcheck after do_configure before do_compile

meta/recipes-kernel/linux/linux-yocto_2.6.37.bb +1 ~~-12~~

index 4199137..34e563c 100644
@@ -9,10 +9,8 @@ KMACHINE_qemumips = "yocto/standard/mti-malta32-be"
 KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
 
 KBRANCH = ${KMACHINE}
-KMETA = meta
 
 LINUX_VERSION ?= "2.6.37"
-LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
 
 SRCREV_machine_qemuarm = "b3e53a090eaa23aa82e64fa0a563a93a2b4dbb5d"
 SRCREV_machine_qemumips = "91f2eb4a3b447476b36aac8e6e198d08c98e0680"

@@ -22,26 +20,17 @@ SRCREV_machine_qemux86-64 = "af2bfbe5f757361b5b027a24d67a93bfdfaaf33c"
 SRCREV_machine = "4ae8f8605c81c39b959948e23f7123294a5dfb3f"
 SRCREV_meta = "aeea99683c7283f1f3320bf2ee7085ee252d4e7e"
 
-PR = "r20"
+PR = "r21"
 PV = "${LINUX_VERSION}+git${SRCPV}"
-SRCREV_FORMAT = "meta_machine"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
 
 COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)"
 
 # Functionality flags
-KERNEL_REVISION_CHECKING ?= "t"
 KERNEL_FEATURES="features/netfilter"
 KERNEL_FEATURES_append=" features/taskstats"
 KERNEL_FEATURES_append_qemux86=" cfg/sound"
 KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
 
-YOCTO_KERNEL_META_DATA=t
-
-# extra tasks
-addtask kernel_link_vmlinux after do_compile before do_install
-addtask validate_branches before do_patch after do_kernel_checkout
-addtask kernel_configcheck after do_configure before do_compile
-
 require linux-tools.inc

meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -7

index f504b74..b296558 100644
@@ -20,9 +20,8 @@ SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1"
 SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e"
 SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7"
 
-PR = "r1"
+PR = "r2"
 PV = "${LINUX_VERSION}+git${SRCPV}"
-SRCREV_FORMAT = "meta_machine"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"

@@ -34,9 +33,4 @@ KERNEL_FEATURES_append=" features/taskstats"
 KERNEL_FEATURES_append_qemux86=" cfg/sound"
 KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
 
-# extra tasks
-addtask kernel_link_vmlinux after do_compile before do_install
-addtask validate_branches before do_patch after do_kernel_checkout
-addtask kernel_configcheck after do_configure before do_compile
-
 require linux-tools.inc

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2011-09-14 18:16 UTC #2 lore raw

PATCH 2/3 linux-yocto: split e100 and e1000 support

In reply to Bruce Ashfield

Merging the following meta changes:

12574e5 meta: create seperate feature for 10/100 LAN support c8b37bf meta: Remove 10/100 LAN support.

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.0.bb    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +1 -1

index ebf6054..36717d6 100644
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3"
 SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af"
-SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7"
+SRCREV_meta ?= "12574e5a77597f6938315ef82d18fc5e229fb79c"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1

index b296558..4b1bdb2 100644
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "eccd57eaa4c2b580b9adbbc39e19ecbff56779ae"
 SRCREV_machine_qemux86 ?= "72671808fdbe69a9fe03fd8f094e7c59da04a28c"
 SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1"
 SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e"
-SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7"
+SRCREV_meta ?= "12574e5a77597f6938315ef82d18fc5e229fb79c"
 
 PR = "r2"
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2011-09-14 18:16 UTC #3 lore raw

PATCH 3/3 linux-yocto-rt: correct 3.0.3->3.0.4 mismerge for, stop_machine.c

In reply to Bruce Ashfield

Merging the following commit for the -rt machines:

[
preempt-rt/base: correct 3.0.3->3.0.4 mismerge for, stop_machine.c

Commit 0b805cce57f61a244eb3b8fce460b14f1be442b3 dropped a change making stop_cpus_mutex non-static, resulting in a build failure for 3.0.4-rt kernels.

Restore the move to non-static from commit
6857336c7fddaf460a13adc0c395698fcf9423ff.

Reported-by Kishore Bodke <[email protected]>

Signed-off-by Darren Hart <[email protected]>

]

Signed-off-by Darren Hart <[email protected]>

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +2 -2

index 36717d6..b3bb4ac 100644
@@ -14,8 +14,8 @@ KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
 LINUX_VERSION ?= "3.0.4"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3"
-SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af"
+SRCREV_machine ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3"
+SRCREV_machine_qemuppc ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3"
 SRCREV_meta ?= "12574e5a77597f6938315ef82d18fc5e229fb79c"
 
 PR = "r1"

Signature · 1 line

1.7.4.1

Saul Wold

Applied

2011-09-15 17:43 UTC #4 lore raw

In reply to Bruce Ashfield

Quoted 32 lines · Bruce Ashfield

Richard/Saul,
Here's a series of changes I've had locally since last week. The two kernel only ones are simple enough.
- a configuration split to clean our x86 BSPs
- a build fix for rt
The net result of the cleanup is zero, since the configs are the same, so there's no reason not to do it.
I've also had the refactored linux-yocto tasks around for a bit, they were brought up while reviewing some 1.1 documentation, and indeed, simplifying the amount of variables required in a linux-yocto based recipe was a 1.1 goal. The result here is also zero, since we are just not resetting things needlessly. I've been building with this for a while, but if you'd rather sit on this until the imminent spin is done, I won't object.
The following changes since commit ce66e2c6bd117d1a40b547b10b376524f9276d16:
core-image-minimal: Add missing POKY_EXTRA_IMAGE variable (2011-09-14 01:29:30 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
Bruce Ashfield (3):
linux-yocto: move common tasks to a common location
linux-yocto: split e100 and e1000 support
linux-yocto-rt: correct 3.0.3->3.0.4 mismerge for, stop_machine.c

Quoted 7 lines

 meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb |    8 +-------
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb    |   14 ++++----------
 meta/recipes-kernel/linux/linux-yocto.inc          |    5 +++++
 meta/recipes-kernel/linux/linux-yocto_2.6.37.bb    |   13 +------------
 meta/recipes-kernel/linux/linux-yocto_3.0.bb       |   10 ++--------
 5 files changed, 13 insertions(+), 37 deletions(-)

Merged into OE-Core

Thanks
Sau!