From e3aa87a5d3a7cbe6f2c835273991a388101b0cde Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 27 May 2016 10:32:22 -0400 Subject: linux-yocto: only use intel branches for optimized platforms Reverting the change that moved common-pc* to the intel staging branches. This means that genericx86, qemux86*, etc, will continue to use standard/base. 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 | 2 +- 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, 6 insertions(+), 6 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 dcdc745783..1d4c404ef0 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 ?= "2b07d06557a049b6ef7038a31651279c33794dbd" +SRCREV_meta ?= "4b4199bd24f206d459061bb0a920d009429d5ed3" 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 15740f9b8e..f09d8f41a7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "3bdc347cc2087a0217e3acddccda5bb775cd570b" -SRCREV_meta ?= "1465ac389f22979618852aa04298049cfdd5dcb4" +SRCREV_meta ?= "3a5f494784591e01f0ae7ab748e8190582c16e8c" 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 ce69c55fd5..9757c4d020 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 ?= "2b07d06557a049b6ef7038a31651279c33794dbd" +SRCREV_meta ?= "4b4199bd24f206d459061bb0a920d009429d5ed3" 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 30a9ecb7c0..d69615f05b 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 ?= "1465ac389f22979618852aa04298049cfdd5dcb4" +SRCREV_meta ?= "3a5f494784591e01f0ae7ab748e8190582c16e8c" 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 39fab5f4a4..e0d288b6e9 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 ?= "2b07d06557a049b6ef7038a31651279c33794dbd" +SRCREV_meta ?= "4b4199bd24f206d459061bb0a920d009429d5ed3" 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 117fe5bc2c..5bfc27d1e5 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 ?= "1465ac389f22979618852aa04298049cfdd5dcb4" +SRCREV_meta ?= "3a5f494784591e01f0ae7ab748e8190582c16e8c" 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