summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-01-31 11:37:31 -0800
committerCalifornia Sullivan <california.l.sullivan@intel.com>2018-01-31 11:37:31 -0800
commit83e1ac29b7dfc2c1df3d7c24bf2acef070531ae9 (patch)
tree728e0a38648c323e46dc085bb5870ca55e9138e4
parenta6a5d581ff39c17873269484f86ff014a13ba2d8 (diff)
downloadmeta-intel-83e1ac29b7dfc2c1df3d7c24bf2acef070531ae9.tar.gz
linux-intel/4.14: Update to v4.14.15
Update both recipes to v4.14.15, linux-intel-rt from v4.14.12 and linux-intel from v4.14.14. Note that the linux-intel-rt kernel branch had to be rebased, causing the recipe to point to invalid commit IDs. It was a one-time error that caused the need to rebase and should not occur again. 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 9846ccd9..5ee3405d 100644
--- a/recipes-kernel/linux/linux-intel-rt_4.14.bb
+++ b/recipes-kernel/linux/linux-intel-rt_4.14.bb
@@ -17,8 +17,8 @@ SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch"
17 17
18DEPENDS += "elfutils-native openssl-native util-linux-native" 18DEPENDS += "elfutils-native openssl-native util-linux-native"
19 19
20LINUX_VERSION ?= "4.14.12" 20LINUX_VERSION ?= "4.14.15"
21SRCREV_machine ?= "e6c754497fe1b52ade748218f2491a2c99209292" 21SRCREV_machine ?= "2c465a6ca02b4b53b583e6878e4751708f591767"
22SRCREV_meta ?= "ee7e849882aa2f0947dd56a60ba5b0d2eec558f2" 22SRCREV_meta ?= "ee7e849882aa2f0947dd56a60ba5b0d2eec558f2"
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 4ce894f3..e6229403 100644
--- a/recipes-kernel/linux/linux-intel_4.14.bb
+++ b/recipes-kernel/linux/linux-intel_4.14.bb
@@ -8,8 +8,8 @@ SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch"
8 8
9DEPENDS += "elfutils-native openssl-native util-linux-native" 9DEPENDS += "elfutils-native openssl-native util-linux-native"
10 10
11LINUX_VERSION ?= "4.14.14" 11LINUX_VERSION ?= "4.14.15"
12SRCREV_machine ?= "1f33a300d545b263fbf32c70bba979a700e083d6" 12SRCREV_machine ?= "386c831d13803af8c6d73afa922333b4a796e994"
13SRCREV_meta ?= "ee7e849882aa2f0947dd56a60ba5b0d2eec558f2" 13SRCREV_meta ?= "ee7e849882aa2f0947dd56a60ba5b0d2eec558f2"
14 14
15# For Crystalforest and Romley 15# For Crystalforest and Romley