linux-yocto/3.10: consolidated update pull request

PATCH Applied Bruce Ashfield 3 participants 9 messages Jan 15, 2014

lore

Share & tools

lore

Bruce Ashfield

author

2014-01-15 05:57 UTC #0 lore raw

cover linux-yocto/3.10: consolidated update pull request

Richard/Saul,

Here are three updates to the 3.10 kernel that I've had for a while. I'm about to merge the 3.10 LTSI content, so it is time to get these out of my queue. I had them for long enough, that muliple updates are squashed into the three patches.

I've build and boot tested the various qemu boards and kernel types, basic sanity has passed.

Cheers,

Bruce

The following changes since commit 1b636173ca88e5ccca1992f9a12367a1189fa674:

bitbake: toaster: Toaster GUI, generic search, filter and order (2014-01-10 15:20:26 +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 (3):
linux-yocto/3.10: update meta data for media fragments linux-yocto/3.10: update to 3.10.25 linux-yocto/3.10: mohonpeak bsp config and scc files

 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   | 10 ++++------
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  7 ++++---
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 18 +++++++++---------
 3 files changed, 17 insertions(+), 18 deletions(-)

Signature · 1 line

1.8.1.2

Bruce Ashfield

author

2014-01-15 05:57 UTC #1 lore raw

PATCH 1/3 linux-yocto/3.10: update meta data for media fragments

Updating the meta SRCREV to import the following changes:

d9cd83c0292b remove old MEDIA config fragments
06b76256d7e2 common-pc-standard.scc: Enable USB webcam support acb8b43837d8 common-pc-64.scc: update as per changes in the media config fragments 5513fd2ad72a minnow-standard.scc: Enable media features
172ba799bedc media-all.scc: A feature including all the media features 1a7e1d3a292e media-platform: A feature for platform media devices 03c48dacbb9a media-dvb-frontends : A feature for Digital Video Broadcast Devices 59b92b9d6c72 media-usb-tv: A feature for USB TV media adapters 5ec0709b1fed media-tuners: A feature for media tuner devices 356dc83e39f3 media-rc: A feature for remote control media devices 89d96cf9d574 media-radio: A feature for AM/FM radio devices 3dd2ebeaf49b media-pci-capture: A feature for PCI media capture devices 9ee0e95bfc52 media-i2c: A feature for I2C media devices
28976f4a3e27 media-usb-webcams: A feature for USB media devices f8206f4e00b1 media: A feature for media infrastructure
08bfb248a17f standard.scc: Add firmware loading feature
e567a3d53593 firmware: A feature for firmware loading support

Signed-off-by Nitin A Kamble <[email protected]>

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

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

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

index d9c5afa3afb6..e81a77ba4ea5 100644
@@ -5,7 +5,7 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
 SRCREV_machine ?= "ee9480cd91b2b46325a2da9aa6ae779d8e4163c0"
 SRCREV_machine_qemuppc ?= "5c126504c0a2f72d80bae9d96cea7eb9d7854290"
-SRCREV_meta ?= "f47ea2844543c8ebf4572cfe23e4cfd6cb94d887"
+SRCREV_meta ?= "d9cd83c0292bd4e2a6754a96761027252e726a42"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"

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

index a866421b5ace..b25edc0baa5e 100644
@@ -10,7 +10,7 @@ LINUX_VERSION ?= "3.10.19"
 KMETA = "meta"
 
 SRCREV_machine ?= "a9ec82e355130160f9094e670bd5be0022a84194"
-SRCREV_meta ?= "f47ea2844543c8ebf4572cfe23e4cfd6cb94d887"
+SRCREV_meta ?= "d9cd83c0292bd4e2a6754a96761027252e726a42"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

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

index 10f290111236..cce8249e98df 100644
@@ -12,13 +12,13 @@ KBRANCH_qemux86-64  = "standard/common-pc-64/base"
 KBRANCH_qemumips64 = "standard/mti-malta64"
 
 SRCREV_machine_qemuarm ?= "7744145fcc3e4b6b6e308a1b86dc1c8b237b7575"
-SRCREV_machine_qemumips  ?= "2b8e8c694c38729ce724facdb0ab20751d061a2e"
+SRCREV_machine_qemumips ?= "2b8e8c694c38729ce724facdb0ab20751d061a2e"
 SRCREV_machine_qemuppc ?= "9a7537cb9bcc5c835dae6ac84fbbe7298473f69c"
 SRCREV_machine_qemux86 ?= "a9ec82e355130160f9094e670bd5be0022a84194"
 SRCREV_machine_qemux86-64 ?= "a9ec82e355130160f9094e670bd5be0022a84194"
 SRCREV_machine_qemumips64 ?= "0cd8e958d0ec7e01fd21fc7891da7eed688b0d37"
 SRCREV_machine ?= "a9ec82e355130160f9094e670bd5be0022a84194"
-SRCREV_meta ?= "f47ea2844543c8ebf4572cfe23e4cfd6cb94d887"
+SRCREV_meta ?= "d9cd83c0292bd4e2a6754a96761027252e726a42"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

Signature · 1 line

1.8.1.2

Bruce Ashfield

author

2014-01-15 05:57 UTC #2 lore raw

PATCH 2/3 linux-yocto/3.10: update to 3.10.25

In reply to Bruce Ashfield

Updating the 3.10 tree to the 3.10.25 korg -stable release.

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

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   | 10 ++++------
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 18 +++++++++---------
 3 files changed, 16 insertions(+), 18 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +4 -6

index e81a77ba4ea5..d301c06eae37 100644
@@ -3,13 +3,11 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "ee9480cd91b2b46325a2da9aa6ae779d8e4163c0"
-SRCREV_machine_qemuppc ?= "5c126504c0a2f72d80bae9d96cea7eb9d7854290"
-SRCREV_meta ?= "d9cd83c0292bd4e2a6754a96761027252e726a42"
+SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
+SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
+SRCREV_meta ?= "778d5f6259f0b8e28a46d8a764979e20e5a8ffc4"
 
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
-
-LINUX_VERSION ?= "3.10.19"
+LINUX_VERSION ?= "3.10.25"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +3 -3

index b25edc0baa5e..e7565c626c5a 100644
@@ -5,12 +5,12 @@ KBRANCH = "${KBRANCH_DEFAULT}"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
-LINUX_VERSION ?= "3.10.19"
+LINUX_VERSION ?= "3.10.25"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "a9ec82e355130160f9094e670bd5be0022a84194"
-SRCREV_meta ?= "d9cd83c0292bd4e2a6754a96761027252e726a42"
+SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_meta ?= "778d5f6259f0b8e28a46d8a764979e20e5a8ffc4"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.10.bb +9 -9

index cce8249e98df..33e745692b25 100644
@@ -11,18 +11,18 @@ KBRANCH_qemux86  = "standard/common-pc/base"
 KBRANCH_qemux86-64  = "standard/common-pc-64/base"
 KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "7744145fcc3e4b6b6e308a1b86dc1c8b237b7575"
-SRCREV_machine_qemumips ?= "2b8e8c694c38729ce724facdb0ab20751d061a2e"
-SRCREV_machine_qemuppc ?= "9a7537cb9bcc5c835dae6ac84fbbe7298473f69c"
-SRCREV_machine_qemux86 ?= "a9ec82e355130160f9094e670bd5be0022a84194"
-SRCREV_machine_qemux86-64 ?= "a9ec82e355130160f9094e670bd5be0022a84194"
-SRCREV_machine_qemumips64 ?= "0cd8e958d0ec7e01fd21fc7891da7eed688b0d37"
-SRCREV_machine ?= "a9ec82e355130160f9094e670bd5be0022a84194"
-SRCREV_meta ?= "d9cd83c0292bd4e2a6754a96761027252e726a42"
+SRCREV_machine_qemuarm ?= "e3163012f3e09fe48374ef22bc676f8b19aeec1a"
+SRCREV_machine_qemumips ?= "01a71aaf8e545c3ef88da1fe02f53d1b96a2640e"
+SRCREV_machine_qemuppc ?= "ae1b9115975ff235038d5da22b4cc984b4d76aae"
+SRCREV_machine_qemux86 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine_qemux86-64 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine_qemumips64 ?= "67efb2993ec7726df5567e2572fd64e34e29b46d"
+SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_meta ?= "778d5f6259f0b8e28a46d8a764979e20e5a8ffc4"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-LINUX_VERSION ?= "3.10.19"
+LINUX_VERSION ?= "3.10.25"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.8.1.2

Bruce Ashfield

author

2014-01-15 05:57 UTC #6 lore raw

PATCH 3/3 linux-yocto/3.10: mohonpeak bsp config and scc files

In reply to Bruce Ashfield

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

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

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

index d301c06eae37..4541a946b707 100644
@@ -5,7 +5,7 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
 SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
 SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
-SRCREV_meta ?= "778d5f6259f0b8e28a46d8a764979e20e5a8ffc4"
+SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
 LINUX_VERSION ?= "3.10.25"

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

index e7565c626c5a..0903c708b9a0 100644
@@ -10,7 +10,8 @@ LINUX_VERSION ?= "3.10.25"
 KMETA = "meta"
 
 SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_meta ?= "778d5f6259f0b8e28a46d8a764979e20e5a8ffc4"
+SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
+
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

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

index 33e745692b25..d0772fddc5f1 100644
@@ -18,7 +18,7 @@ SRCREV_machine_qemux86 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
 SRCREV_machine_qemux86-64 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
 SRCREV_machine_qemumips64 ?= "67efb2993ec7726df5567e2572fd64e34e29b46d"
 SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_meta ?= "778d5f6259f0b8e28a46d8a764979e20e5a8ffc4"
+SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

Signature · 1 line

1.8.1.2

Otavio Salvador

2014-01-15 11:27 UTC #7 lore raw

Re: [PATCH 3/3] linux-yocto/3.10: mohonpeak bsp config and scc files

Quoted 27 lines · Bruce Ashfield

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

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

(quoted diff) +0 -0

linux-yocto-rt_3.10.bb
index d301c06eae37..4541a946b707 100644

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

@@ -5,7 +5,7 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
 SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
 SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
-SRCREV_meta ?= "778d5f6259f0b8e28a46d8a764979e20e5a8ffc4"
+SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
 LINUX_VERSION ?= "3.10.25"

(quoted diff) +0 -0

linux-yocto-tiny_3.10.bb
index e7565c626c5a..0903c708b9a0 100644

meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb LINUX_VERSION ?= "3.10.25" · line 15

Quoted 7 lines

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

@@ -10,7 +10,8 @@ LINUX_VERSION ?= "3.10.25"
 KMETA = "meta"
 
 SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_meta ?= "778d5f6259f0b8e28a46d8a764979e20e5a8ffc4"
+SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
+

left over new line.

Quoted 27 lines

meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +0 -0
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
(quoted diff) +0 -0
linux-yocto_3.10.bb
index 33e745692b25..d0772fddc5f1 100644
meta/recipes-kernel/linux/linux-yocto_3.10.bb +0 -0
@@ -18,7 +18,7 @@ SRCREV_machine_qemux86 ?=
"79af968f2f26378798aec7a6d729ff5a371aae5f"
SRCREV_machine_qemux86-64 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f" SRCREV_machine_qemumips64 ?= "67efb2993ec7726df5567e2572fd64e34e29b46d" SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +1 -1
-SRCREV_meta ?= "778d5f6259f0b8e28a46d8a764979e20e5a8ffc4"
+SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
 SRC_URI = "git://
git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta "
--
1.8.1.2
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 3 lines

Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Richard Purdie

Applied

2014-01-15 12:26 UTC #8 lore raw

Re: [PATCH 3/3] linux-yocto/3.10: mohonpeak bsp config and scc files

Quoted 11 lines · Otavio Salvador

On Wed, Jan 15, 2014 at 3:57 AM, Bruce Ashfield
<[email protected]> wrote:

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

         SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
        -SRCREV_meta ?= "778d5f6259f0b8e28a46d8a764979e20e5a8ffc4"
        +SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
        +

Quoted 1 line

left over new line.

Queued in master-next with that extra newline missing.

Cheers,

Richard

Richard Purdie

2014-01-15 15:06 UTC #3 lore raw

Re: [PATCH 2/3] linux-yocto/3.10: update to 3.10.25

In reply to Bruce Ashfield

Quoted 16 lines · Bruce Ashfield

Updating the 3.10 tree to the 3.10.25 korg -stable release.

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

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   | 10 ++++------
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 18 +++++++++---------
 3 files changed, 16 insertions(+), 18 deletions(-)

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

index e81a77ba4ea5..d301c06eae37 100644
@@ -3,13 +3,11 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"

meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb require recipes-kernel/linux/linux-yocto.inc · line 11

Quoted 10 lines

meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +3 -5

 
-SRCREV_machine ?= "ee9480cd91b2b46325a2da9aa6ae779d8e4163c0"
-SRCREV_machine_qemuppc ?= "5c126504c0a2f72d80bae9d96cea7eb9d7854290"
-SRCREV_meta ?= "d9cd83c0292bd4e2a6754a96761027252e726a42"
+SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
+SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
+SRCREV_meta ?= "778d5f6259f0b8e28a46d8a764979e20e5a8ffc4"
 
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
-

I'm guessing this shouldn't remove the above line? It triggers parse failures...

CHeers,

Richard

Quoted 5 lines

meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +1 -1
-LINUX_VERSION ?= "3.10.19"
+LINUX_VERSION ?= "3.10.25"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 

Bruce Ashfield

author

2014-01-15 15:12 UTC #4 lore raw

Re: [PATCH 2/3] linux-yocto/3.10: update to 3.10.25

Quoted 25 lines · Richard Purdie

Quoted 24 lines · Bruce Ashfield

Updating the 3.10 tree to the 3.10.25 korg -stable release.

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

---
  meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   | 10 ++++------
  meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  6 +++---
  meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 18 +++++++++---------
  3 files changed, 16 insertions(+), 18 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +3 -3

index e81a77ba4ea5..d301c06eae37 100644
@@ -3,13 +3,11 @@ require recipes-kernel/linux/linux-yocto.inc
  KBRANCH = "standard/preempt-rt/base"
  KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "ee9480cd91b2b46325a2da9aa6ae779d8e4163c0"
-SRCREV_machine_qemuppc ?= "5c126504c0a2f72d80bae9d96cea7eb9d7854290"
-SRCREV_meta ?= "d9cd83c0292bd4e2a6754a96761027252e726a42"
+SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
+SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
+SRCREV_meta ?= "778d5f6259f0b8e28a46d8a764979e20e5a8ffc4"

Quoted 5 lines

meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb require recipes-kernel/linux/linux-yocto.inc · line 11
Quoted 2 lines
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +0 -2
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
-
I'm guessing this shouldn't remove the above line? It triggers parse failures...

urk. He who rebases patch series late at night, shouldn't hit send until the morning.

That was aggressive trailing whitespace cleanup gone bad. If you can restore it, I'll be eternally grateful. Or I can resend, but that seems like excessive overhead for an obvious mess up.

Bruce

Quoted 12 lines

CHeers,
Richard
Quoted 5 lines
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +1 -1
-LINUX_VERSION ?= "3.10.19"
+LINUX_VERSION ?= "3.10.25"
 
  PV = "${LINUX_VERSION}+git${SRCPV}"
 

Richard Purdie

2014-01-15 15:47 UTC #5 lore raw

Re: [PATCH 2/3] linux-yocto/3.10: update to 3.10.25

Quoted 32 lines · Bruce Ashfield

Quoted 25 lines · Richard Purdie
Quoted 24 lines · Bruce Ashfield
Updating the 3.10 tree to the 3.10.25 korg -stable release.
Signed-off-by Bruce Ashfield <[email protected]>
---
  meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   | 10 ++++------
  meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  6 +++---
  meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 18 +++++++++---------
  3 files changed, 16 insertions(+), 18 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +3 -3
index e81a77ba4ea5..d301c06eae37 100644
@@ -3,13 +3,11 @@ require recipes-kernel/linux/linux-yocto.inc
  KBRANCH = "standard/preempt-rt/base"
  KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "ee9480cd91b2b46325a2da9aa6ae779d8e4163c0"
-SRCREV_machine_qemuppc ?= "5c126504c0a2f72d80bae9d96cea7eb9d7854290"
-SRCREV_meta ?= "d9cd83c0292bd4e2a6754a96761027252e726a42"
+SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
+SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
+SRCREV_meta ?= "778d5f6259f0b8e28a46d8a764979e20e5a8ffc4"
 
Quoted 5 lines
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb require recipes-kernel/linux/linux-yocto.inc · line 11
Quoted 2 lines
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +0 -2
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
-
I'm guessing this shouldn't remove the above line? It triggers parse failures...

Quoted 6 lines

urk. He who rebases patch series late at night, shouldn't hit send until the morning.
That was aggressive trailing whitespace cleanup gone bad. If you can restore it, I'll be eternally grateful. Or I can resend, but that seems like excessive overhead for an obvious mess up.

I've tweaked it in master-next.

Cheers,

Richard