summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-02-14 20:36:45 (GMT)
committerCalifornia Sullivan <california.l.sullivan@intel.com>2018-02-14 20:44:00 (GMT)
commit84cd64d6aa1d0abbf981156dd83f1d69b55c30bd (patch)
tree9e0d4f6f2e218a46915d456fb729427394bf85c9
parent9e9ad9da03fd48b4012f425f5ce8698be20f9e16 (diff)
downloadmeta-intel-84cd64d6aa1d0abbf981156dd83f1d69b55c30bd.tar.gz
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 <california.l.sullivan@intel.com>
-rw-r--r--recipes-kernel/linux/linux-intel-rt_4.14.bb4
-rw-r--r--recipes-kernel/linux/linux-intel_4.14.bb4
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-intel-rt_4.14.bb b/recipes-kernel/linux/linux-intel-rt_4.14.bb
index 5ee3405..aa203ee 100644
--- a/recipes-kernel/linux/linux-intel-rt_4.14.bb
+++ b/recipes-kernel/linux/linux-intel-rt_4.14.bb
@@ -10,7 +10,7 @@ python () {
10} 10}
11 11
12KBRANCH = "4.14/yocto/base-rt" 12KBRANCH = "4.14/yocto/base-rt"
13KMETA_BRANCH = "master" 13KMETA_BRANCH = "yocto-4.14"
14 14
15# Fix for 32-bit perf issue. Remove when patch is backported to 4.14. 15# Fix for 32-bit perf issue. Remove when patch is backported to 4.14.
16SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch" 16SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch"
@@ -19,6 +19,6 @@ DEPENDS += "elfutils-native openssl-native util-linux-native"
19 19
20LINUX_VERSION ?= "4.14.15" 20LINUX_VERSION ?= "4.14.15"
21SRCREV_machine ?= "2c465a6ca02b4b53b583e6878e4751708f591767" 21SRCREV_machine ?= "2c465a6ca02b4b53b583e6878e4751708f591767"
22SRCREV_meta ?= "ee7e849882aa2f0947dd56a60ba5b0d2eec558f2" 22SRCREV_meta ?= "245d701df6c3691a078a268eff54009959beb842"
23 23
24LINUX_KERNEL_TYPE = "preempt-rt" 24LINUX_KERNEL_TYPE = "preempt-rt"
diff --git a/recipes-kernel/linux/linux-intel_4.14.bb b/recipes-kernel/linux/linux-intel_4.14.bb
index e622940..ae6d0dc 100644
--- a/recipes-kernel/linux/linux-intel_4.14.bb
+++ b/recipes-kernel/linux/linux-intel_4.14.bb
@@ -1,7 +1,7 @@
1require linux-intel.inc 1require linux-intel.inc
2 2
3KBRANCH = "4.14/yocto/base" 3KBRANCH = "4.14/yocto/base"
4KMETA_BRANCH = "master" 4KMETA_BRANCH = "yocto-4.14"
5 5
6# Fix for 32-bit perf issue. Remove when patch is backported to 4.14. 6# Fix for 32-bit perf issue. Remove when patch is backported to 4.14.
7SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch" 7SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch"
@@ -10,7 +10,7 @@ DEPENDS += "elfutils-native openssl-native util-linux-native"
10 10
11LINUX_VERSION ?= "4.14.15" 11LINUX_VERSION ?= "4.14.15"
12SRCREV_machine ?= "386c831d13803af8c6d73afa922333b4a796e994" 12SRCREV_machine ?= "386c831d13803af8c6d73afa922333b4a796e994"
13SRCREV_meta ?= "ee7e849882aa2f0947dd56a60ba5b0d2eec558f2" 13SRCREV_meta ?= "245d701df6c3691a078a268eff54009959beb842"
14 14
15# For Crystalforest and Romley 15# For Crystalforest and Romley
16KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" 16KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"