linux-yocto: consolidated pull request

PATCH Applied Bruce Ashfield 3 participants 8 messages Feb 5, 2012 – Feb 8, 2012

lore

Share & tools

lore

Bruce Ashfield

author

2012-02-05 06:39 UTC #0 lore raw

cover linux-yocto: consolidated pull request

Richard/Saul,

This is a follow on to the 3.2 tree and src_patches changes that I sent last week.

The ability to specify out of tree BSPs via single .scc files is not possible, as well as any automatic BSPs following the naming conventions of the 3.2 tree.

The meta branch changes are routine, with the exception being that I got a report that 3.0 -rt wasn't patching. That report turned out to be true, and I've fixed it here.

Cheers,

Bruce

The following changes since commit cb89d43473a91ff4cb2447d642fcd9308d7366e3:

libzypp: add missing runtime dependences on gzip and gnupg (2012-02-03 17:23:34 +0000)

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 (5):
linux-yocto: locate and use out of tree features specified on the
SRC_URI
linux-yocto: meta updates for sys940x and cleanup
linux-yocto: rt compiliation fix
kern-tools: remove explicit 'yocto' references from auto-bsp handling
linux-yocto: fri2: use emgd-1.10

 meta/classes/kernel-yocto.bbclass                  |   21 ++++++++++++++++++++
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb    |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.0.bb       |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.2.bb       |    2 +-
 5 files changed, 25 insertions(+), 4 deletions(-)

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2012-02-05 06:39 UTC #1 lore raw

PATCH 1/5 linux-yocto: locate and use out of tree features specified on the SRC_URI

In a similar manner to calling the patch.bbclass to locate patches that were listed on the SRC_URI, it is also useful to query about 'other' items that are on the SRC_URI. In the case of linux-yocto, it allows us to know about kernel features that were specific on the URI and then apply them to the current tree.

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

---
 meta/classes/kernel-yocto.bbclass |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

meta/classes/kernel-yocto.bbclass +21 -0

index 7fdefcf..3130bf4 100644
@@ -10,6 +10,16 @@ def find_patches(d):
 
 	return patch_list
 
+def find_sccs(d):
+	sources=src_patches(d, True)
+	sources_list=[]
+	for s in sources:
+		base, ext = os.path.splitext(os.path.basename(s))
+		if ext and ext in ('.scc'):
+			sources_list.append(s)
+
+	return sources_list
+
 do_patch() {
 	cd ${S}
 	if [ -f ${WORKDIR}/defconfig ]; then

@@ -42,6 +52,7 @@ do_patch() {
 	fi
 
 	patches="${@" ".join(find_patches(d))}"
+	sccs="${@" ".join(find_sccs(d))}"
 
 	# This loops through all patches, and looks for directories that do
 	# not already have feature descriptions. If a directory doesn't have

@@ -81,6 +92,16 @@ do_patch() {
 		fi
 	done
 
+	# look for any found scc files, and ensure they are added to the list
+	# of directories passsed to updateme
+	for s in ${sccs}; do
+		sdir=`dirname ${s}`
+		echo ${patch_dirs} | grep -q ${sdir}
+		if [ $? -ne 0 ]; then
+			patch_dirs="${patch_dirs} ${sdir}"
+		fi
+	done
+
 	# go through the patch directories and look for any scc feature files
 	# that were constructed above. If one is found, rename it to ".scc" so
 	# the kernel patching can see it.

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2012-02-05 06:39 UTC #2 lore raw

PATCH 2/5 linux-yocto: meta updates for sys940x and cleanup

In reply to Bruce Ashfield

Updating the meta SRCREV to pickup the following changes:

[
Author: Darren Hart <[email protected]>
Date: Wed Feb 1 09:37:48 2012 -0800

Remove boot-live cfg duplication from BSPs

Several BSPs duplicated the boot-live fragment in their BSP specific config. Remove the duplication and add CONFIG_RD_GZIP and CONFIG_BLK_DEV_SR to the boot-live fragment.

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

Acked-by Tom Zanussi <[email protected]>

Author: Darren Hart <[email protected]>
Date: Tue Jan 31 13:18:17 2012 -0800

meta: sys940x BSP meta data

The Inforce SYS940x-ECX Developer-Ready Reference Platform features:
o Intel Atom E6xx (0.6-1.6 GHz)
o Up to 1GB on-board DDR2
o Intel Platform Controller Hub EG20T
o VGA,LVDS
o HD Audio
o SD Card
o Dual SATA
o Mini-PCIe

http://www.inforcecomputing.com/SYS940X_ECX.html

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

Acked-by Tom Zanussi <[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 |    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 5402f17..7f902fc 100644
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "2f9d925f5681eaae7f341cc1270c739e8b329c03"
 SRCREV_machine_qemuppc ?= "c66f7ef2315010756c8c97af6b13d52f9f18c03b"
-SRCREV_meta ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"
+SRCREV_meta ?= "77ca4855e80acb8dad21acea946908716c308b5b"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

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

index 6ff6027..f7bb0d4 100644
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "15fd748017f0849138ff4b47d73f6866fa26cfe8"
 SRCREV_machine_qemux86 ?= "8f74a4339b3dc029fafff0ba7d88d6dc950d4b31"
 SRCREV_machine_qemux86-64 ?= "610c5a62daeda033755b0b7bfcb3e2cad5c76f3f"
 SRCREV_machine ?= "5df0b4c2538399aed543133b3855f809adf08ab8"
-SRCREV_meta ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"
+SRCREV_meta ?= "77ca4855e80acb8dad21acea946908716c308b5b"
 
 PR = "r3"
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2012-02-05 06:39 UTC #3 lore raw

PATCH 3/5 linux-yocto: rt compiliation fix

In reply to Bruce Ashfield

Updating the meta SRCREC to pickup the following changes:

70e86dc meta/rt: update rt patch cache

Without this change a 3.0 based -rt build will fail to patch.

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 7f902fc..d7e4e7a 100644
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "2f9d925f5681eaae7f341cc1270c739e8b329c03"
 SRCREV_machine_qemuppc ?= "c66f7ef2315010756c8c97af6b13d52f9f18c03b"
-SRCREV_meta ?= "77ca4855e80acb8dad21acea946908716c308b5b"
+SRCREV_meta ?= "70e86dc937a40c0dc7c84549de0e86bb09f12da3"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

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

index f7bb0d4..67f8da1 100644
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "15fd748017f0849138ff4b47d73f6866fa26cfe8"
 SRCREV_machine_qemux86 ?= "8f74a4339b3dc029fafff0ba7d88d6dc950d4b31"
 SRCREV_machine_qemux86-64 ?= "610c5a62daeda033755b0b7bfcb3e2cad5c76f3f"
 SRCREV_machine ?= "5df0b4c2538399aed543133b3855f809adf08ab8"
-SRCREV_meta ?= "77ca4855e80acb8dad21acea946908716c308b5b"
+SRCREV_meta ?= "70e86dc937a40c0dc7c84549de0e86bb09f12da3"
 
 PR = "r3"
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2012-02-05 06:39 UTC #4 lore raw

PATCH 4/5 kern-tools: remove explicit 'yocto' references from auto-bsp handling

In reply to Bruce Ashfield

To adapt to different branch names in a repository, removing explicit references to 'yocto' in automatically created BSPs ensures that they are consistent with the merged variants. Existing BSPs and auto BSPs are not impacted by this change.

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

---
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +1 -1

index 1eced23..14ec9e9 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "a7a9930d2b1f1954fbd817810b706e2e3c42e8de"
+SRCREV = "91c2b184be90d6654996887203efdd7f1727a19a"
 PR = r12
 PV = "0.1+git${SRCPV}"

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2012-02-05 06:39 UTC #5 lore raw

PATCH 5/5 linux-yocto: fri2: use emgd-1.10

In reply to Bruce Ashfield

Updating meta for the following change:

fri2: use emgd-1.10

Use the yocto/emgd-1.10 branch in place of yocto/emgd.

Signed-off-by Tom Zanussi <[email protected]>

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

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

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

index a80924d..c13fb37 100644
@@ -23,7 +23,7 @@ SRCREV_machine_qemuppc ?= "b8228f337002ad88f1e152d0c0c46c6035cd0428"
 SRCREV_machine_qemux86 ?= "417fc778a86e81303bab5883b919ee422ec51c04"
 SRCREV_machine_qemux86-64 ?= "417fc778a86e81303bab5883b919ee422ec51c04"
 SRCREV_machine ?= "417fc778a86e81303bab5883b919ee422ec51c04"
-SRCREV_meta ?= "138bf5b502607fe40315c0d76822318d77d97e01"
+SRCREV_meta ?= "b78a519841bd8b477cad599af8d38df6760445c1"
 
 PR = "r0"
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.7.4.1

Bruce Ashfield

2012-02-07 16:32 UTC #6 lore raw

Re: [PATCH 5/5] linux-yocto: fri2: use emgd-1.10

meta/recipes-kernel/linux/linux-yocto_3.2.bb

Quoted 16 lines · Bruce Ashfield

Updating meta for the following change:
fri2: use emgd-1.10
Use the yocto/emgd-1.10 branch in place of yocto/emgd.
Signed-off-by Tom Zanussi <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
---
meta/recipes-kernel/linux/linux-yocto_3.2.bb | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-kernel/linux/linux-yocto_3.2.bb +0 -0
index a80924d..c13fb37 100644

An update on this change:

I touched the wrong file for this update, the emgd changes are for the 3.0 kernel, not 3.2 (they will eventually be there as well, just not now). I've fixed
this and re-pushed the top commit to my contrib branch.

The new diffstat is this:

  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(-)

I'm off to check my builders to see why this chugged along in my local testing.

Cheers,

Bruce

Quoted 17 lines

meta/recipes-kernel/linux/linux-yocto_3.2.bb +0 -0
@@ -23,7 +23,7 @@ SRCREV_machine_qemuppc ?= "b8228f337002ad88f1e152d0c0c46c6035cd0428"
SRCREV_machine_qemux86 ?= "417fc778a86e81303bab5883b919ee422ec51c04" SRCREV_machine_qemux86-64 ?= "417fc778a86e81303bab5883b919ee422ec51c04" SRCREV_machine ?= "417fc778a86e81303bab5883b919ee422ec51c04"
meta/recipes-kernel/linux/linux-yocto_3.2.bb +1 -1
-SRCREV_meta ?= "138bf5b502607fe40315c0d76822318d77d97e01"
+SRCREV_meta ?= "b78a519841bd8b477cad599af8d38df6760445c1"
PR = "r0"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.4.1
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 2 lines

"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

Saul Wold

Applied

2012-02-08 04:18 UTC #7 lore raw

In reply to Bruce Ashfield

Quoted 33 lines · Bruce Ashfield

Richard/Saul,
This is a follow on to the 3.2 tree and src_patches changes that I sent last week.
The ability to specify out of tree BSPs via single .scc files is not possible, as well as any automatic BSPs following the naming conventions of the 3.2 tree.
The meta branch changes are routine, with the exception being that I got a report that 3.0 -rt wasn't patching. That report turned out to be true, and I've fixed it here.
Cheers,
Bruce
The following changes since commit cb89d43473a91ff4cb2447d642fcd9308d7366e3:
libzypp: add missing runtime dependences on gzip and gnupg (2012-02-03 17:23:34 +0000)
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 (5):
linux-yocto: locate and use out of tree features specified on the
SRC_URI
linux-yocto: meta updates for sys940x and cleanup
linux-yocto: rt compiliation fix
kern-tools: remove explicit 'yocto' references from auto-bsp handling
linux-yocto: fri2: use emgd-1.10

Quoted 7 lines

  meta/classes/kernel-yocto.bbclass                  |   21 ++++++++++++++++++++
  .../kern-tools/kern-tools-native_git.bb            |    2 +-
  meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb    |    2 +-
  meta/recipes-kernel/linux/linux-yocto_3.0.bb       |    2 +-
  meta/recipes-kernel/linux/linux-yocto_3.2.bb       |    2 +-
  5 files changed, 25 insertions(+), 4 deletions(-)

Merged into OE-core with updated patch set

Thanks
Sau!