diff options
author | Saul Wold <sgw@linux.intel.com> | 2017-12-07 16:40:22 -0800 |
---|---|---|
committer | California Sullivan <california.l.sullivan@intel.com> | 2017-12-21 11:48:38 -0800 |
commit | 1f16f45c875883c9ab0e9686527671945b12329a (patch) | |
tree | 9103dc56aef4d800c246d126d8d1ccfe90d59666 /common/recipes-kernel/linux/linux-intel.inc | |
parent | 5adbf6df4fd89e7531ccccfb9cec7a5314d635f0 (diff) | |
download | meta-intel-1f16f45c875883c9ab0e9686527671945b12329a.tar.gz |
linux-intel: Update 4.9 SRCREV and refactor
This has a SRCREV update to bring linux-intel to HEAD with some
audio and pnp patches.
The refactor moves the selection of branch to the versioned recipe
so we can have a shared linux-intel-lts repo with multiple LTS version
branches.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
(cherry picked from commit 8d37591e1186dcfbf679c1db660d6f9ffa41bb39)
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Diffstat (limited to 'common/recipes-kernel/linux/linux-intel.inc')
-rw-r--r-- | common/recipes-kernel/linux/linux-intel.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/common/recipes-kernel/linux/linux-intel.inc b/common/recipes-kernel/linux/linux-intel.inc index 1f26d451..bde24ba5 100644 --- a/common/recipes-kernel/linux/linux-intel.inc +++ b/common/recipes-kernel/linux/linux-intel.inc | |||
@@ -3,17 +3,15 @@ require recipes-kernel/linux/linux-yocto.inc | |||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" | 3 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" |
4 | 4 | ||
5 | KERNEL_CONFIG_URI ?= " \ | 5 | KERNEL_CONFIG_URI ?= " \ |
6 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA} \ | 6 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \ |
7 | " | 7 | " |
8 | SRC_URI = " \ | 8 | SRC_URI = " \ |
9 | git://github.com/01org/linux-intel-4.9.git;protocol=https;name=machine;branch=${KBRANCH}; \ | 9 | git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ |
10 | ${KERNEL_CONFIG_URI} \ | 10 | ${KERNEL_CONFIG_URI} \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" | 13 | SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" |
14 | 14 | ||
15 | |||
16 | LINUX_VERSION ?= "4.9.56" | ||
17 | LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}" | 15 | LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}" |
18 | 16 | ||
19 | PV = "${LINUX_VERSION}+git${SRCPV}" | 17 | PV = "${LINUX_VERSION}+git${SRCPV}" |