linux-yocto: -rc4 pull request

PATCH Applied Bruce Ashfield 2 participants 5 messages Apr 17, 2012 – Apr 18, 2012

lore

Share & tools

lore

Bruce Ashfield

author

2012-04-17 22:11 UTC #0 lore raw

cover linux-yocto: -rc4 pull request

Richard/Saul,

Here's a set of 3 fixes that should be considered for -rc4. I split things up as much as I could, in the order that they should be taken.

1/3: linux-yocto: .diff is a valid patch extension

This was reported on IRC today, it was an easy fix to an obvious problem. I doubled check the old cases and the new .diff case. I've also confirmed that patch.bbclass and these patch extensions agree.

2/3: linux-yocto/meta: beagleboard: disable CONFIG_PREEMPT

This is the merge of Denys' fix for the beagleboard boot issue (aka YOCTO 1892]. With this booting on the xM is fixed. I've merged it into the tree in a named config, so we'll be able to easily identify it in the future. This same change is in the 3.0 kernel, and staged in the 3.2 and 3.4 trees as well.

3/3: linux-yocto/meta: remove kernel config audit warnings

This is from Yang Shi @ Wind River. It fixes the issues reporting on the mailing list during the beta testing. The qemu* BSPs on 3.2 and the hardware references on 3.0 now audit cleanly during the kernel build. This is one of those items we promise with each release, and it took a bit longer to acheive this time.

Yang and I looked at these and only obselete / invalid options are removed or are tagged as 'hardware' to declare them valid and remove a warning. The functional changes limited. Yang boot tested the changes and I've re-run the audit testing here.

(my master branch is a bit out of date, but I had to switch to my secondary builder for testing, and didn't want to disturb it. There are no changes in master that would impact this testing).

cc Yang Shi <[email protected]>

cc Denys Dmytriyenko <[email protected]>

Cheers,

Bruce

The following changes since commit 5326847ef821c382aac26b474ab0e35939c463b7:

Hob: fixed a little view issue about package selection page (2012-04-16 12:56:25 +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: .diff is a valid patch extension linux-yocto/meta: beagleboard: disable CONFIG_PREEMPT linux-yocto/meta: remove kernel config audit warnings

 meta/classes/kernel-yocto.bbclass                  |    2 +-
 .../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-rt_3.2.bb    |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb  |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.0.bb       |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.2.bb       |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

Signature · 1 line

1.7.5.4

Bruce Ashfield

author

2012-04-17 22:11 UTC #1 lore raw

PATCH 1/3 linux-yocto: .diff is a valid patch extension

In fixing an existing patch migration bug, the list of valid extensions got out of sync from the core patch class. As a result, valid patches were not being applied to the tree.

Updating the tools to migrate .diff files fixes the issue.

Also in this fix is the removal of .patch in the find_sccs() routine, since it will never be returned by patch.bbclass when all non-patches are requested, it is simply confusing.

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

---
 meta/classes/kernel-yocto.bbclass                  |    2 +-
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

meta/classes/kernel-yocto.bbclass +1 -1

index 0caf6a6..c995a2e 100644
@@ -20,7 +20,7 @@ def find_sccs(d):
 	sources_list=[]
 	for s in sources:
 		base, ext = os.path.splitext(os.path.basename(s))
-		if ext and ext in ('.scc' '.cfg' '.patch'):
+		if ext and ext in ('.scc' '.cfg'):
 			sources_list.append(s)
 		elif base and base in 'defconfig':
 			sources_list.append(s)

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

index d1c2ee4..754ebe5 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "67bcedda582b2b191f26ec47dd1d4eac37f1305c"
+SRCREV = "2bbbaaa00cc70887d6d6f745b9425890d522d240"
 PR = "r12"
 PV = "0.1+git${SRCPV}"

Signature · 1 line

1.7.5.4

Bruce Ashfield

author

2012-04-17 22:11 UTC #2 lore raw

PATCH 2/3 linux-yocto/meta: beagleboard: disable CONFIG_PREEMPT

In reply to Bruce Ashfield

Updating the meta SRCREV for both the 3.0 and 3.2 kernel trees to pickup the beagleboard xM boot fix:

[
meta/beagleboard: disable CONFIG_PREEMPT

The boot hangs with the message:
mmc0: error -110 whilst initialising SD card

The MMC driver has issues initializing when PREEMPT is enabled (either forced or voluntary). Unplugging and then plugging the card back will reset the driver and continue booting. Alternatively, disable preemption.
]

[YOCTO: #1892]

Signed-off-by Denys Dmytriyenko <[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-rt_3.2.bb   |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.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, 5 insertions(+), 5 deletions(-)

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

index d8644b7..10459f3 100644
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "cf280f1dc5877d4ca43d21307222326efa68bb27"
 SRCREV_machine_qemuppc ?= "afaa5baa6a9ca9c8a03a9a3eee2ba9fba089f416"
-SRCREV_meta ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c"
+SRCREV_meta ?= "bb4fff95b3d28c8ab87cd6905eaef86e1f46db6e"
 
 PR = "r2"
 PV = "${LINUX_VERSION}+git${SRCPV}"

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

index efc4611..aae4ce0 100644
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "32ecb53e9ff759bbd297a10712b62a6575daaf86"
 SRCREV_machine_qemuppc ?= "0d5625bb868cc2471d5dd49eb7abe7eb5fe1044b"
-SRCREV_meta ?= "135c75bf9615334b5b8bb9108d612fe7dfbdb901"
+SRCREV_meta ?= "ad5a00b6c5bcdd1740d8fa42be122fc8ff2c579f"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb +1 -1

index fbff706..6c65707 100644
@@ -12,7 +12,7 @@ KCONFIG_MODE = "--allnoconfig"
 LINUX_VERSION ?= "3.2.11"
 
 SRCREV_machine ?= "ec236058dc254183dbfb3744bf21f110c37af30b"
-SRCREV_meta ?= "135c75bf9615334b5b8bb9108d612fe7dfbdb901"
+SRCREV_meta ?= "ad5a00b6c5bcdd1740d8fa42be122fc8ff2c579f"
 
 PR = "r0"
 PV = "${LINUX_VERSION}+git${SRCPV}"

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

index e56e1d7..0d98074 100644
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "7528f1d06ef5665eed8c1498f62d5403b82bbbd6"
 SRCREV_machine_qemux86 ?= "f153b0eb8264dc1e69f59d4c9173619feb4d5bd9"
 SRCREV_machine_qemux86-64 ?= "aac580659dc0ce083f250fb05abf82e58d7f4531"
 SRCREV_machine ?= "da7c40006b08916ff3a3db104def82aaf9ac2716"
-SRCREV_meta ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c"
+SRCREV_meta ?= "bb4fff95b3d28c8ab87cd6905eaef86e1f46db6e"
 
 PR = "r4"
 PV = "${LINUX_VERSION}+git${SRCPV}"

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

index 8bea0a0..54361a2 100644
@@ -23,7 +23,7 @@ SRCREV_machine_qemuppc ?= "92de4e2f3c6b397c8b363e079cc4d5e9bcadf877"
 SRCREV_machine_qemux86 ?= "8ada1bb97415fe959a57a08504be4eb8a656ed30"
 SRCREV_machine_qemux86-64 ?= "4ca7e2c5d42e755e1b4c3e1478128f047a8ed2a8"
 SRCREV_machine ?= "01e948c2bdf7f5ad9f2b30047a8d3493a1a2880a"
-SRCREV_meta ?= "135c75bf9615334b5b8bb9108d612fe7dfbdb901"
+SRCREV_meta ?= "ad5a00b6c5bcdd1740d8fa42be122fc8ff2c579f"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.7.5.4

Bruce Ashfield

author

2012-04-17 22:11 UTC #3 lore raw

PATCH 3/3 linux-yocto/meta: remove kernel config audit warnings

In reply to Bruce Ashfield

Updating the meta SRCREVs to pickup the following meta change for the 3.0 and 3.2 kernels:

[
meta: Clean up BSPs kernel config

Clean up some QEMU and non-x86 BSPs kernel config, including

qemuarm
qemuppc
qemux86
beagleboard
mpc8315e_rdb

Only obsolete/invalid kernel configs are removed.

Signed-off-by Yang Shi <[email protected]>

]

With this commit, the configuration audit for the qemu and hardware reference boards is (largely) warning free.

Signed-off-by Yang Shi <[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-rt_3.2.bb   |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.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, 5 insertions(+), 5 deletions(-)

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

index 10459f3..36dcb6e 100644
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "cf280f1dc5877d4ca43d21307222326efa68bb27"
 SRCREV_machine_qemuppc ?= "afaa5baa6a9ca9c8a03a9a3eee2ba9fba089f416"
-SRCREV_meta ?= "bb4fff95b3d28c8ab87cd6905eaef86e1f46db6e"
+SRCREV_meta ?= "34e0d2b4b4e9778b31f9ea99ca43f0dc71a7ee23"
 
 PR = "r2"
 PV = "${LINUX_VERSION}+git${SRCPV}"

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

index aae4ce0..05674ef 100644
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "32ecb53e9ff759bbd297a10712b62a6575daaf86"
 SRCREV_machine_qemuppc ?= "0d5625bb868cc2471d5dd49eb7abe7eb5fe1044b"
-SRCREV_meta ?= "ad5a00b6c5bcdd1740d8fa42be122fc8ff2c579f"
+SRCREV_meta ?= "b14a08f5c7b469a5077c10942f4e1aec171faa9d"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb +1 -1

index 6c65707..4957e33 100644
@@ -12,7 +12,7 @@ KCONFIG_MODE = "--allnoconfig"
 LINUX_VERSION ?= "3.2.11"
 
 SRCREV_machine ?= "ec236058dc254183dbfb3744bf21f110c37af30b"
-SRCREV_meta ?= "ad5a00b6c5bcdd1740d8fa42be122fc8ff2c579f"
+SRCREV_meta ?= "b14a08f5c7b469a5077c10942f4e1aec171faa9d"
 
 PR = "r0"
 PV = "${LINUX_VERSION}+git${SRCPV}"

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

index 0d98074..074b1ed 100644
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "7528f1d06ef5665eed8c1498f62d5403b82bbbd6"
 SRCREV_machine_qemux86 ?= "f153b0eb8264dc1e69f59d4c9173619feb4d5bd9"
 SRCREV_machine_qemux86-64 ?= "aac580659dc0ce083f250fb05abf82e58d7f4531"
 SRCREV_machine ?= "da7c40006b08916ff3a3db104def82aaf9ac2716"
-SRCREV_meta ?= "bb4fff95b3d28c8ab87cd6905eaef86e1f46db6e"
+SRCREV_meta ?= "34e0d2b4b4e9778b31f9ea99ca43f0dc71a7ee23"
 
 PR = "r4"
 PV = "${LINUX_VERSION}+git${SRCPV}"

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

index 54361a2..d81f6b5 100644
@@ -23,7 +23,7 @@ SRCREV_machine_qemuppc ?= "92de4e2f3c6b397c8b363e079cc4d5e9bcadf877"
 SRCREV_machine_qemux86 ?= "8ada1bb97415fe959a57a08504be4eb8a656ed30"
 SRCREV_machine_qemux86-64 ?= "4ca7e2c5d42e755e1b4c3e1478128f047a8ed2a8"
 SRCREV_machine ?= "01e948c2bdf7f5ad9f2b30047a8d3493a1a2880a"
-SRCREV_meta ?= "ad5a00b6c5bcdd1740d8fa42be122fc8ff2c579f"
+SRCREV_meta ?= "b14a08f5c7b469a5077c10942f4e1aec171faa9d"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.7.5.4

Saul Wold

Applied

2012-04-18 15:12 UTC #4 lore raw

In reply to Bruce Ashfield

Quoted 57 lines · Bruce Ashfield

Richard/Saul,
Here's a set of 3 fixes that should be considered for -rc4. I split things up as much as I could, in the order that they should be taken.
1/3: linux-yocto: .diff is a valid patch extension
This was reported on IRC today, it was an easy fix to an obvious problem. I doubled check the old cases and the new .diff case. I've also confirmed that patch.bbclass and these patch extensions agree.
2/3: linux-yocto/meta: beagleboard: disable CONFIG_PREEMPT
This is the merge of Denys' fix for the beagleboard boot issue (aka YOCTO 1892]. With this booting on the xM is fixed. I've merged it into the tree in a named config, so we'll be able to easily identify it in the future. This same change is in the 3.0 kernel, and staged in the 3.2 and 3.4 trees as well.
3/3: linux-yocto/meta: remove kernel config audit warnings
This is from Yang Shi @ Wind River. It fixes the issues reporting on the mailing list during the beta testing. The qemu* BSPs on 3.2 and the hardware references on 3.0 now audit cleanly during the kernel build. This is one of those items we promise with each release, and it took a bit longer to acheive this time.
Yang and I looked at these and only obselete / invalid options are removed or are tagged as 'hardware' to declare them valid and remove a warning. The functional changes limited. Yang boot tested the changes and I've re-run the audit testing here.
(my master branch is a bit out of date, but I had to switch to my secondary builder for testing, and didn't want to disturb it. There are no changes in master that would impact this testing).
cc Yang Shi<[email protected]>
cc Denys Dmytriyenko<[email protected]>
Cheers,
Bruce
The following changes since commit 5326847ef821c382aac26b474ab0e35939c463b7:
Hob: fixed a little view issue about package selection page (2012-04-16 12:56:25 +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: .diff is a valid patch extension linux-yocto/meta: beagleboard: disable CONFIG_PREEMPT linux-yocto/meta: remove kernel config audit warnings

Quoted 9 lines

  meta/classes/kernel-yocto.bbclass                  |    2 +-
  .../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-rt_3.2.bb    |    2 +-
  meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb  |    2 +-
  meta/recipes-kernel/linux/linux-yocto_3.0.bb       |    2 +-
  meta/recipes-kernel/linux/linux-yocto_3.2.bb       |    2 +-
  7 files changed, 7 insertions(+), 7 deletions(-)

Merged into OE-Core

Thanks
Sau!