From 141bf482d50638d79d89475468d1d8f97729b009 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 27 May 2016 10:32:21 -0400 Subject: linux-yocto: create intel branches To provide timely support for Intel platforms, without risking issues with other platforms, we create intel branches from the common variants. i.e. We now have standard/intel, which is from standard/base These branches will be managed like any other in the tree, and will get common -stable, -rt, bugs and CVE updates. (From OE-Core rev: 5bc0ce92545b8940a90d96912e46d6320b3a015e) Signed-off-by: Tom Zanussi Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.4.bb | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'meta/recipes-kernel') 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 51fa3adeb2..dcdc745783 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "320892013ad33ab41f530ad321939aec07d09d22" -SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" +SRCREV_meta ?= "2b07d06557a049b6ef7038a31651279c33794dbd" 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-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb index a6f7dcca5e..15740f9b8e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb @@ -1,4 +1,4 @@ -KBRANCH ?= "standard/preempt-rt" +KBRANCH ?= "standard/preempt-rt/base" require recipes-kernel/linux/linux-yocto.inc @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "3bdc347cc2087a0217e3acddccda5bb775cd570b" -SRCREV_meta ?= "6ec93aaa70f838b551f58b91d0c6ffeff6f6094b" +SRCREV_meta ?= "1465ac389f22979618852aa04298049cfdd5dcb4" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;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 35a76ef0cd..ce69c55fd5 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 ?= "ecc983477682203619da0e456fa4a8689ac41097" -SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" +SRCREV_meta ?= "2b07d06557a049b6ef7038a31651279c33794dbd" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb index e05b27a769..30a9ecb7c0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb @@ -10,7 +10,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "53e84104c5e68eb468823dd0d262a64623d01a55" -SRCREV_meta ?= "6ec93aaa70f838b551f58b91d0c6ffeff6f6094b" +SRCREV_meta ?= "1465ac389f22979618852aa04298049cfdd5dcb4" 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 2332e11f42..39fab5f4a4 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 ?= "ecc983477682203619da0e456fa4a8689ac41097" SRCREV_machine_qemux86-64 ?= "ecc983477682203619da0e456fa4a8689ac41097" SRCREV_machine_qemumips64 ?= "1db47ec6c39071b29f82a040b9b9a81584f50461" SRCREV_machine ?= "ecc983477682203619da0e456fa4a8689ac41097" -SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" +SRCREV_meta ?= "2b07d06557a049b6ef7038a31651279c33794dbd" 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}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb index 984a49c85e..117fe5bc2c 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "53e84104c5e68eb468823dd0d262a64623d01a55" SRCREV_machine_qemux86-64 ?= "53e84104c5e68eb468823dd0d262a64623d01a55" SRCREV_machine_qemumips64 ?= "7ce6e58742b2f1f79cc8b1a1fff8bc408a3b585e" SRCREV_machine ?= "53e84104c5e68eb468823dd0d262a64623d01a55" -SRCREV_meta ?= "6ec93aaa70f838b551f58b91d0c6ffeff6f6094b" +SRCREV_meta ?= "1465ac389f22979618852aa04298049cfdd5dcb4" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" -- cgit 1.2.3-korg