aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-kernel/linux/linux-intel.inc1
-rw-r--r--recipes-kernel/linux/linux-intel_4.14.bb8
-rw-r--r--recipes-kernel/linux/linux-intel_4.9.bb4
3 files changed, 9 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index 2525c70d..f2ba0d13 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -7,7 +7,6 @@ KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;n
SRC_URI = " \
git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
- file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \
${KERNEL_CONFIG_URI} \
"
diff --git a/recipes-kernel/linux/linux-intel_4.14.bb b/recipes-kernel/linux/linux-intel_4.14.bb
index d9d13d55..e0ecf1c4 100644
--- a/recipes-kernel/linux/linux-intel_4.14.bb
+++ b/recipes-kernel/linux/linux-intel_4.14.bb
@@ -4,12 +4,14 @@ KBRANCH = "4.14/base"
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"
+SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch \
+ file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \
+ "
DEPENDS += "elfutils-native openssl-native util-linux-native"
-LINUX_VERSION ?= "4.14.78"
-SRCREV_machine ?= "56f15146cf0573a64a02f6d0ed2f002d4e1037d5"
+LINUX_VERSION ?= "4.14.87"
+SRCREV_machine ?= "2a9c1c646fe78a5e784ad7af0e43762c37b7015e"
SRCREV_meta ?= "6a3254e7b370cbb86c1f73379dcf38885c1c69e0"
# For Crystalforest and Romley
diff --git a/recipes-kernel/linux/linux-intel_4.9.bb b/recipes-kernel/linux/linux-intel_4.9.bb
index e2f1eaad..30db4d34 100644
--- a/recipes-kernel/linux/linux-intel_4.9.bb
+++ b/recipes-kernel/linux/linux-intel_4.9.bb
@@ -4,6 +4,10 @@ require linux-intel.inc
KBRANCH = "4.9/yocto/base"
KMETA_BRANCH = "yocto-4.9"
+SRC_URI_append = " \
+ file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \
+ "
+
LINUX_VERSION ?= "4.9.134"
SRCREV_machine ?= "33c9f20d1f40e87af4ccaf55c0fabb89b068d6ab"
SRCREV_meta ?= "f9e90afd4e47920e990dacb73cd6508917ca5422"