summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-02-15 19:08:37 (GMT)
committerCalifornia Sullivan <california.l.sullivan@intel.com>2018-02-15 20:40:46 (GMT)
commit42072ef80e0a3dfc65188778b471f0db9264520e (patch)
tree7d0a80183660c75cf4ba75599576131f2f204231
parentd781d5e52c123b104284467888453ec1f68f4b64 (diff)
downloadmeta-intel-42072ef80e0a3dfc65188778b471f0db9264520e.tar.gz
linux-intel/4.9: Update to v4.9.77
This comprises of a kernel update from v4.9.56 to v4.9.77. Due to refactoring in later versions of the recipe, a clean backport isn't possible. Instead, just update to the same SRCREVs manually. Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
-rw-r--r--common/recipes-kernel/linux/linux-intel-rt_4.9.bb6
-rw-r--r--common/recipes-kernel/linux/linux-intel_4.9.bb6
2 files changed, 6 insertions, 6 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 ae99056..a61cdf1 100644
--- a/common/recipes-kernel/linux/linux-intel-rt_4.9.bb
+++ b/common/recipes-kernel/linux/linux-intel-rt_4.9.bb
@@ -11,8 +11,8 @@ python () {
11} 11}
12 12
13KBRANCH = "4.9/yocto/base-rt" 13KBRANCH = "4.9/yocto/base-rt"
14SRCREV_machine ?= "44f76edc2079f1551be33b8ab473349d00f814a7" 14SRCREV_machine ?= "ae1aee65fd27590eff2c308ad5661a13d023641d"
15SRCREV_meta ?= "cdbd35c54b6a62e4fd543164f1dcdf92c85cff2d" 15SRCREV_meta ?= "a2dfb1610d9dad34652a3c27c6c9d8751ed67af6"
16 16
17FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" 17FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:"
18 18
@@ -21,7 +21,7 @@ SRC_URI = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machin
21 21
22SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" 22SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg"
23 23
24LINUX_VERSION ?= "4.9.56" 24LINUX_VERSION ?= "4.9.77"
25LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}" 25LINUX_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 5c3f981..9bcc53d 100644
--- a/common/recipes-kernel/linux/linux-intel_4.9.bb
+++ b/common/recipes-kernel/linux/linux-intel_4.9.bb
@@ -2,15 +2,15 @@
2require recipes-kernel/linux/linux-yocto.inc 2require recipes-kernel/linux/linux-yocto.inc
3 3
4KBRANCH = "4.9/yocto/base" 4KBRANCH = "4.9/yocto/base"
5SRCREV_machine ?= "e8405acd549563650e2e4774a49e069d161e8fe1" 5SRCREV_machine ?= "d7f2f7269253c2be1c1000d49d2bded4ba70407a"
6SRCREV_meta ?= "cdbd35c54b6a62e4fd543164f1dcdf92c85cff2d" 6SRCREV_meta ?= "a2dfb1610d9dad34652a3c27c6c9d8751ed67af6"
7 7
8SRC_URI = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ 8SRC_URI = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
9 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" 9 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
10 10
11SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" 11SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg"
12 12
13LINUX_VERSION ?= "4.9.56" 13LINUX_VERSION ?= "4.9.77"
14LINUX_VERSION_EXTENSION = "-intel-pk-${LINUX_KERNEL_TYPE}" 14LINUX_VERSION_EXTENSION = "-intel-pk-${LINUX_KERNEL_TYPE}"
15 15
16PV = "${LINUX_VERSION}+git${SRCPV}" 16PV = "${LINUX_VERSION}+git${SRCPV}"