[PATCH 0/2] linux-yocto/4.1: -rt and common-pc updates

[PATCH 0/2] linux-yocto/4.1: -rt and common-pc updates

[Bruce Ashfield]

Hi all,

During some routine merges over the last weeks, some of the
branches in the 4.1 kernel managed to get reset to invalid
SRCREVs, which meant that some changes (i.e. arm fixes for
gcc5) were dangling within the repo. We've fixed the standard
kernel references now .. but a bug report about -rt's build
being broken alerted me to the fact that the -rt branches were
also impacted.

I've now fixed, built and booted on all the qemu architectures
for preempt-rt.

This update fixes the SRCREVs to pickup that refreshed support, 
and includes a change to the common-pc configuration as well.

Cheers,

Bruce

The following changes since commit 9f66aa1a11b5b45280aa41bf4517ec56ee5f2ab2:

  bitbake: toaster: start script warning text formatting small improvement (2015-09-23 22:44:56 +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 (2):
  linux-yocto/4.1: common-pc-drivers: add CONFIG_PATA_SCH
  linux-yocto/4.1: rt update to 4.1.x-rt8

 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   | 4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

-- 
2.1.0

[PATCH 1/2] linux-yocto/4.1: common-pc-drivers: add CONFIG_PATA_SCH

[Bruce Ashfield]

Updating the meta SRCREVs to integrate the following config change:

Author: Saul Wold <sgw@linux.intel.com>
Date:   Tue Sep 22 07:23:06 2015 -0700

    common-pc-drivers: add CONFIG_PATA_SCH

    The NUC uses this hardware and should still operate correctly with a
    genericx86

    Signed-off-by: Saul Wold <sgw@linux.intel.com>
    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
index ad26334cd134..0d9ecf50cc19 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
@@ -3,7 +3,7 @@ KBRANCH ?= "standard/preempt-rt"
 require recipes-kernel/linux/linux-yocto.inc
 
 SRCREV_machine ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
-SRCREV_meta ?= "ef417dc3dbac098e2273b9157bf7ea8b1ade0ec5"
+SRCREV_meta ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
index 63fca3f0842d..69aac25e74bb 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
-SRCREV_meta ?= "ef417dc3dbac098e2273b9157bf7ea8b1ade0ec5"
+SRCREV_meta ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index d5a612bd29bc..0d8d28136736 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
 SRCREV_machine_qemux86-64 ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
 SRCREV_machine_qemumips64 ?= "049105492e5657dd735bad1aa3a32f4f752a9edd"
 SRCREV_machine ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
-SRCREV_meta ?= "ef417dc3dbac098e2273b9157bf7ea8b1ade0ec5"
+SRCREV_meta ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
-- 
2.1.0

[PATCH 2/2] linux-yocto/4.1: rt update to 4.1.x-rt8

[Bruce Ashfield]

The -rt build suffered the same breakage in master as the standard
kernel builds: due to a bad git history merge, existing patches were
dropped from branches.

This meant that we were missing the -rt changes, which re-introduced
some failures with linux-yocto-rt.

With these SRCREV updates, we have the latest 4.1.x-rt and all
architectures build.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   | 4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
index 0d9ecf50cc19..352ac3ddfa72 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
@@ -2,8 +2,8 @@ KBRANCH ?= "standard/preempt-rt"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
-SRCREV_meta ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc"
+SRCREV_machine ?= "eefb205d7ff4afc66a95fd06d31d4e69c3deec39"
+SRCREV_meta ?= "d6b2416f396f03e73c1d53352ebd0acb6133e5ba"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
index 69aac25e74bb..833b11b010af 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
-SRCREV_meta ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc"
+SRCREV_meta ?= "d6b2416f396f03e73c1d53352ebd0acb6133e5ba"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index 0d8d28136736..0645134b023b 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
 SRCREV_machine_qemux86-64 ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
 SRCREV_machine_qemumips64 ?= "049105492e5657dd735bad1aa3a32f4f752a9edd"
 SRCREV_machine ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
-SRCREV_meta ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc"
+SRCREV_meta ?= "d6b2416f396f03e73c1d53352ebd0acb6133e5ba"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
-- 
2.1.0