diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-08-21 13:23:22 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-30 12:36:04 +0100 |
commit | 6dd4209c2d08ce8227e94ba84a3562a4517ea733 (patch) | |
tree | 857cf0f1f6a9af7f3a265e65d77227322da3a4ae /meta/recipes-kernel | |
parent | d1d3b6466a59eee67ccc4588712b39c160affaf7 (diff) | |
download | poky-6dd4209c2d08ce8227e94ba84a3562a4517ea733.tar.gz |
linux-yocto/4.1: update to v4.1.6 and v4.1.6-rt5
Bumping the SRCREVs to import the latest 4.1-stable and 4.1-rt changes.
(From OE-Core rev: 21fd4093bbd0177453a1e749d825cf510746f201)
(From OE-Core rev: 576fb9f267f7dbca2b76a68903f335be108160e7)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.1.bb | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb index 3473316d91..5c60875c71 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | |||
@@ -2,13 +2,13 @@ KBRANCH ?= "standard/preempt-rt" | |||
2 | 2 | ||
3 | require recipes-kernel/linux/linux-yocto.inc | 3 | require recipes-kernel/linux/linux-yocto.inc |
4 | 4 | ||
5 | SRCREV_machine ?= "74159a303c210bca8ea5c5636fc5b17d47e51aa1" | 5 | SRCREV_machine ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" |
6 | SRCREV_meta ?= "833214b33303ecde02fdcd1a9bc7901ded6a7976" | 6 | SRCREV_meta ?= "833214b33303ecde02fdcd1a9bc7901ded6a7976" |
7 | 7 | ||
8 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ | 8 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ |
9 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" | 9 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" |
10 | 10 | ||
11 | LINUX_VERSION ?= "4.1.2" | 11 | LINUX_VERSION ?= "4.1.6" |
12 | 12 | ||
13 | PV = "${LINUX_VERSION}+git${SRCPV}" | 13 | PV = "${LINUX_VERSION}+git${SRCPV}" |
14 | 14 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb index 105f31c90a..d79c786111 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | |||
@@ -4,12 +4,12 @@ KCONFIG_MODE = "--allnoconfig" | |||
4 | 4 | ||
5 | require recipes-kernel/linux/linux-yocto.inc | 5 | require recipes-kernel/linux/linux-yocto.inc |
6 | 6 | ||
7 | LINUX_VERSION ?= "4.1.2" | 7 | LINUX_VERSION ?= "4.1.6" |
8 | 8 | ||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "74159a303c210bca8ea5c5636fc5b17d47e51aa1" | 12 | SRCREV_machine ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" |
13 | SRCREV_meta ?= "833214b33303ecde02fdcd1a9bc7901ded6a7976" | 13 | SRCREV_meta ?= "833214b33303ecde02fdcd1a9bc7901ded6a7976" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb index ecc7253429..82511c8dfb 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb | |||
@@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "standard/base" | 11 | KBRANCH_qemux86-64 ?= "standard/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "0352ebb49ba09bd09dee69d6df4af1388d3f4992" | 14 | SRCREV_machine_qemuarm ?= "89601a6f23a7dd842f24911f0438d0b45c85aa00" |
15 | SRCREV_machine_qemuarm64 ?= "74159a303c210bca8ea5c5636fc5b17d47e51aa1" | 15 | SRCREV_machine_qemuarm64 ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" |
16 | SRCREV_machine_qemumips ?= "46ec81f8b6d8f6c6906280651d2aa5e18d3bb63f" | 16 | SRCREV_machine_qemumips ?= "4132a691d0908d10b8f07ce7ece02e6dc94e17bc" |
17 | SRCREV_machine_qemuppc ?= "74159a303c210bca8ea5c5636fc5b17d47e51aa1" | 17 | SRCREV_machine_qemuppc ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" |
18 | SRCREV_machine_qemux86 ?= "74159a303c210bca8ea5c5636fc5b17d47e51aa1" | 18 | SRCREV_machine_qemux86 ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" |
19 | SRCREV_machine_qemux86-64 ?= "74159a303c210bca8ea5c5636fc5b17d47e51aa1" | 19 | SRCREV_machine_qemux86-64 ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" |
20 | SRCREV_machine_qemumips64 ?= "9c23f12286ee4aafe695153f4ebf5b9d4cdfd909" | 20 | SRCREV_machine_qemumips64 ?= "033e1aa633465449edf544eb81adda0caf16ec60" |
21 | SRCREV_machine ?= "74159a303c210bca8ea5c5636fc5b17d47e51aa1" | 21 | SRCREV_machine ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" |
22 | SRCREV_meta ?= "833214b33303ecde02fdcd1a9bc7901ded6a7976" | 22 | SRCREV_meta ?= "833214b33303ecde02fdcd1a9bc7901ded6a7976" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" |
26 | 26 | ||
27 | LINUX_VERSION ?= "4.1.2" | 27 | LINUX_VERSION ?= "4.1.6" |
28 | 28 | ||
29 | PV = "${LINUX_VERSION}+git${SRCPV}" | 29 | PV = "${LINUX_VERSION}+git${SRCPV}" |
30 | 30 | ||