diff options
author | California Sullivan <california.l.sullivan@intel.com> | 2018-04-13 18:23:04 -0700 |
---|---|---|
committer | California Sullivan <california.l.sullivan@intel.com> | 2018-04-13 18:23:04 -0700 |
commit | 9b37952d6af36358b6397cedf3dd53ec8962b6bf (patch) | |
tree | 72ad0e6d643f9e50189abfaa24bd60341556b086 | |
parent | 42072ef80e0a3dfc65188778b471f0db9264520e (diff) | |
download | meta-intel-9b37952d6af36358b6397cedf3dd53ec8962b6bf.tar.gz |
linux-intel/4.9: Update to v4.9.81
Brings in changes from linux-stable up to v4.9.81.
Due to refactoring in later versions of the recipe, a clean backport
isn't possible. Instead, just update to the same SRCREVs manually.
Mirrors commit "e5e3fe42 linux-intel/4.9: Update to v4.9.81" upstream.
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
-rw-r--r-- | common/recipes-kernel/linux/linux-intel-rt_4.9.bb | 4 | ||||
-rw-r--r-- | common/recipes-kernel/linux/linux-intel_4.9.bb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/recipes-kernel/linux/linux-intel-rt_4.9.bb b/common/recipes-kernel/linux/linux-intel-rt_4.9.bb index a61cdf1c..1eeccd12 100644 --- a/common/recipes-kernel/linux/linux-intel-rt_4.9.bb +++ b/common/recipes-kernel/linux/linux-intel-rt_4.9.bb | |||
@@ -11,7 +11,7 @@ python () { | |||
11 | } | 11 | } |
12 | 12 | ||
13 | KBRANCH = "4.9/yocto/base-rt" | 13 | KBRANCH = "4.9/yocto/base-rt" |
14 | SRCREV_machine ?= "ae1aee65fd27590eff2c308ad5661a13d023641d" | 14 | SRCREV_machine ?= "5a78c84100e737140558a3ef3e22e5a9380e8589" |
15 | SRCREV_meta ?= "a2dfb1610d9dad34652a3c27c6c9d8751ed67af6" | 15 | SRCREV_meta ?= "a2dfb1610d9dad34652a3c27c6c9d8751ed67af6" |
16 | 16 | ||
17 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" | 17 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" |
@@ -21,7 +21,7 @@ SRC_URI = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machin | |||
21 | 21 | ||
22 | SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" | 22 | SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" |
23 | 23 | ||
24 | LINUX_VERSION ?= "4.9.77" | 24 | LINUX_VERSION ?= "4.9.81" |
25 | LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}" | 25 | LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}" |
26 | 26 | ||
27 | 27 | ||
diff --git a/common/recipes-kernel/linux/linux-intel_4.9.bb b/common/recipes-kernel/linux/linux-intel_4.9.bb index 9bcc53da..79e80970 100644 --- a/common/recipes-kernel/linux/linux-intel_4.9.bb +++ b/common/recipes-kernel/linux/linux-intel_4.9.bb | |||
@@ -2,7 +2,7 @@ | |||
2 | require recipes-kernel/linux/linux-yocto.inc | 2 | require recipes-kernel/linux/linux-yocto.inc |
3 | 3 | ||
4 | KBRANCH = "4.9/yocto/base" | 4 | KBRANCH = "4.9/yocto/base" |
5 | SRCREV_machine ?= "d7f2f7269253c2be1c1000d49d2bded4ba70407a" | 5 | SRCREV_machine ?= "c249d8e0ca9fef0ace933f1ef21d514b5915d783" |
6 | SRCREV_meta ?= "a2dfb1610d9dad34652a3c27c6c9d8751ed67af6" | 6 | SRCREV_meta ?= "a2dfb1610d9dad34652a3c27c6c9d8751ed67af6" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ | 8 | SRC_URI = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ |
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machin | |||
10 | 10 | ||
11 | SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" | 11 | SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" |
12 | 12 | ||
13 | LINUX_VERSION ?= "4.9.77" | 13 | LINUX_VERSION ?= "4.9.81" |
14 | LINUX_VERSION_EXTENSION = "-intel-pk-${LINUX_KERNEL_TYPE}" | 14 | LINUX_VERSION_EXTENSION = "-intel-pk-${LINUX_KERNEL_TYPE}" |
15 | 15 | ||
16 | PV = "${LINUX_VERSION}+git${SRCPV}" | 16 | PV = "${LINUX_VERSION}+git${SRCPV}" |