From 42f891704bc4f98fe69d89c2f362b7e3a8feb369 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Wed, 14 Feb 2018 12:36:45 -0800 Subject: linux-intel/4.14: change KBRANCH to 4.14 and update SRCREVs A named branch has now been created, so use that instead of master. Also update the cache SRCREV. No functional changes to the generated config, but the cache has been refactored to not reference unsupported platforms. Signed-off-by: California Sullivan (cherry picked from commit 84cd64d6aa1d0abbf981156dd83f1d69b55c30bd) Signed-off-by: California Sullivan --- common/recipes-kernel/linux/linux-intel-rt_4.14.bb | 4 ++-- common/recipes-kernel/linux/linux-intel_4.14.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/recipes-kernel/linux/linux-intel-rt_4.14.bb b/common/recipes-kernel/linux/linux-intel-rt_4.14.bb index 5ee3405d..aa203ee4 100644 --- a/common/recipes-kernel/linux/linux-intel-rt_4.14.bb +++ b/common/recipes-kernel/linux/linux-intel-rt_4.14.bb @@ -10,7 +10,7 @@ python () { } KBRANCH = "4.14/yocto/base-rt" -KMETA_BRANCH = "master" +KMETA_BRANCH = "yocto-4.14" # Fix for 32-bit perf issue. Remove when patch is backported to 4.14. SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch" @@ -19,6 +19,6 @@ DEPENDS += "elfutils-native openssl-native util-linux-native" LINUX_VERSION ?= "4.14.15" SRCREV_machine ?= "2c465a6ca02b4b53b583e6878e4751708f591767" -SRCREV_meta ?= "ee7e849882aa2f0947dd56a60ba5b0d2eec558f2" +SRCREV_meta ?= "245d701df6c3691a078a268eff54009959beb842" LINUX_KERNEL_TYPE = "preempt-rt" diff --git a/common/recipes-kernel/linux/linux-intel_4.14.bb b/common/recipes-kernel/linux/linux-intel_4.14.bb index e6229403..ae6d0dc3 100644 --- a/common/recipes-kernel/linux/linux-intel_4.14.bb +++ b/common/recipes-kernel/linux/linux-intel_4.14.bb @@ -1,7 +1,7 @@ require linux-intel.inc KBRANCH = "4.14/yocto/base" -KMETA_BRANCH = "master" +KMETA_BRANCH = "yocto-4.14" # Fix for 32-bit perf issue. Remove when patch is backported to 4.14. SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch" @@ -10,7 +10,7 @@ DEPENDS += "elfutils-native openssl-native util-linux-native" LINUX_VERSION ?= "4.14.15" SRCREV_machine ?= "386c831d13803af8c6d73afa922333b4a796e994" -SRCREV_meta ?= "ee7e849882aa2f0947dd56a60ba5b0d2eec558f2" +SRCREV_meta ?= "245d701df6c3691a078a268eff54009959beb842" # For Crystalforest and Romley KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" -- cgit v1.2.3-54-g00ecf