diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-06-13 11:56:31 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 18:05:21 +0100 |
commit | 62f4fa49f9afa7b69e69d4092e0da1baae8bd033 (patch) | |
tree | b2e3c21d50788e4df0041a91e72c42c373ac3ead /meta | |
parent | 7ccbe39357c3c1a8d44ea6dc680bf4f3d5ec6334 (diff) | |
download | poky-62f4fa49f9afa7b69e69d4092e0da1baae8bd033.tar.gz |
linux-yocto/4.1: bump to v4.1.26
Integrating the 4.1.25 and 4.1.26 stable releases.
(From OE-Core rev: 298a3c38ac99282554b51bdc0abec2423b6ce694)
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')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.1.bb | 20 |
3 files changed, 16 insertions, 16 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 8e9b5c2df0..7cd18e0c7b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | |||
@@ -11,13 +11,13 @@ python () { | |||
11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "86876311e39eadc80c342a619906cb001ed1df0d" | 14 | SRCREV_machine ?= "ec9e847b58017b62931bc4fbf7c968da5b0297cf" |
15 | SRCREV_meta ?= "f0c7ef844e98c82db9ee90e20c0eff6596919ff5" | 15 | SRCREV_meta ?= "9f68667031354532563766a3d04ca8a618e9177a" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" |
19 | 19 | ||
20 | LINUX_VERSION ?= "4.1.24" | 20 | LINUX_VERSION ?= "4.1.26" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
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 c48e2a6494..5b1b87f828 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | |||
@@ -4,13 +4,13 @@ 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.24" | 7 | LINUX_VERSION ?= "4.1.26" |
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 ?= "b4acdc6d1ea9474453689e5f604dd7037cbb5033" | 12 | SRCREV_machine ?= "f1069e0dbbc09f930ba8941e38859378ccc22f96" |
13 | SRCREV_meta ?= "f0c7ef844e98c82db9ee90e20c0eff6596919ff5" | 13 | SRCREV_meta ?= "9f68667031354532563766a3d04ca8a618e9177a" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb index 9e83d76f80..4023c9b98e 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 ?= "ec626d56541042b8bcc52c47891dd8acedb326c7" | 14 | SRCREV_machine_qemuarm ?= "fa1f75003687404ebe8a07c967db1714c700f9ff" |
15 | SRCREV_machine_qemuarm64 ?= "b4acdc6d1ea9474453689e5f604dd7037cbb5033" | 15 | SRCREV_machine_qemuarm64 ?= "f1069e0dbbc09f930ba8941e38859378ccc22f96" |
16 | SRCREV_machine_qemumips ?= "95866476d89898fdb61804029352af74daa4a30d" | 16 | SRCREV_machine_qemumips ?= "0e2b4693ec90691494752ff7854493f3c7f3fc2f" |
17 | SRCREV_machine_qemuppc ?= "b4acdc6d1ea9474453689e5f604dd7037cbb5033" | 17 | SRCREV_machine_qemuppc ?= "f1069e0dbbc09f930ba8941e38859378ccc22f96" |
18 | SRCREV_machine_qemux86 ?= "b4acdc6d1ea9474453689e5f604dd7037cbb5033" | 18 | SRCREV_machine_qemux86 ?= "f1069e0dbbc09f930ba8941e38859378ccc22f96" |
19 | SRCREV_machine_qemux86-64 ?= "b4acdc6d1ea9474453689e5f604dd7037cbb5033" | 19 | SRCREV_machine_qemux86-64 ?= "f1069e0dbbc09f930ba8941e38859378ccc22f96" |
20 | SRCREV_machine_qemumips64 ?= "9824fc2399454b9c521b0b1bde075ac862357d41" | 20 | SRCREV_machine_qemumips64 ?= "ca5c9e5ee5e3b569a55beb05e2f81078d3db2cef" |
21 | SRCREV_machine ?= "b4acdc6d1ea9474453689e5f604dd7037cbb5033" | 21 | SRCREV_machine ?= "f1069e0dbbc09f930ba8941e38859378ccc22f96" |
22 | SRCREV_meta ?= "f0c7ef844e98c82db9ee90e20c0eff6596919ff5" | 22 | SRCREV_meta ?= "9f68667031354532563766a3d04ca8a618e9177a" |
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.24" | 27 | LINUX_VERSION ?= "4.1.26" |
28 | 28 | ||
29 | PV = "${LINUX_VERSION}+git${SRCPV}" | 29 | PV = "${LINUX_VERSION}+git${SRCPV}" |
30 | 30 | ||