From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Tue, 18 Aug 2015 17:55:11 +0000 (-0400)
Subject: linux-yocto/4.1: fix qemuarm preempt-rt configuration
X-Git-Tag: 2015-10~714
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f18b19e1be0b84d431328f87ec4a694ac1415469;p=openembedded-core.git

linux-yocto/4.1: fix qemuarm preempt-rt configuration

With the recent changes to the kernel meta data handling and the
removal of BSP branches, we need to shuffle some patches around to
match.

This prevents patches from being applied twice, and the qemuarm BSP
can be configured for preempt-rt.

[YOCTO: #8122]

(From OE-Core rev: b6b7a80440521a8e82cfe6c56dddedf061de6208)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index a7a52cb627..9eff93d357 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 ?= "4e30e64c44df9e59bd13239951bb8d2b5b276e6f"
 SRCREV_machine_qemux86-64 ?= "4e30e64c44df9e59bd13239951bb8d2b5b276e6f"
 SRCREV_machine_qemumips64 ?= "5c2b3697082a4ec6641aa5a8eca3974ca609cecf"
 SRCREV_machine ?= "4e30e64c44df9e59bd13239951bb8d2b5b276e6f"
-SRCREV_meta ?= "45393dd54f5ad77d43014c407c2b3520da42f427"
+SRCREV_meta ?= "0a1457774f203eae4213822a0bd17a07f3b5d89a"
 
 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}"