summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-10-25 23:15:51 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-26 09:31:47 +0100
commite0644d6bd318079797a88539fd869adb38a99e50 (patch)
tree4600fdb600e39da911985a0b6f8f7ac48bff58e2 /meta
parenta8169807e85457d90016522a6eb7113c9159ec18 (diff)
downloadpoky-e0644d6bd318079797a88539fd869adb38a99e50.tar.gz
linux-yocto/4.8: sync preempt-rt with upstream project
The initial 4.8 -rt feature was directly from Paul Gortmaker, and now the 'upstream' -rt has done a release on the same kernel version. Paul has sync'd the initial effort with the upstream work, and we now have a consolidated standard/preempt-rt/* Along with the rsync'd content, Paul has fixed -rt boot on 32 bit x86. (From OE-Core rev: 1270050079feeefc38744fdbfe23b16aa1b632a3) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.8.bb2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
index 00c3d2c7bc..e51c9cdcca 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
@@ -11,8 +11,8 @@ python () {
11 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "320bceb35315d118c1e209effd441eb8a8dbad57" 14SRCREV_machine ?= "4057556c041f6aac0d29aa3425587d414c9a0090"
15SRCREV_meta ?= "6d028d2818603cd82cfb707b3231b8a9038f13bb" 15SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
index 799c3f3757..c8ddbd93dc 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794" 12SRCREV_machine ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
13SRCREV_meta ?= "6d028d2818603cd82cfb707b3231b8a9038f13bb" 13SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.8.bb b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
index 56fbfc7001..13778b9c4d 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
19SRCREV_machine_qemux86-64 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794" 19SRCREV_machine_qemux86-64 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
20SRCREV_machine_qemumips64 ?= "64f96ba530e58456070f26b0f3fcce3f64988b72" 20SRCREV_machine_qemumips64 ?= "64f96ba530e58456070f26b0f3fcce3f64988b72"
21SRCREV_machine ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794" 21SRCREV_machine ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
22SRCREV_meta ?= "6d028d2818603cd82cfb707b3231b8a9038f13bb" 22SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"