summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-08-20 00:30:34 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-23 17:44:34 +0100
commit4b80b346a7de5f104af80881482240eff886c62e (patch)
tree0ffc23c8169053132a09b77ba23500fd5b4ff647
parent7b97f591a6617d2a3d48492ea2589fcedaabf455 (diff)
downloadpoky-4b80b346a7de5f104af80881482240eff886c62e.tar.gz
linux-yocto/4.1/4.4: -stable updates and configuration changes
Updating the 4.4 kernel to v4.4.18 and the 4.1 kernel to v4.1.30. We also tweak the configuration with the following commits to remove warnings being generated from the 4.4 kernel (due to options being dropped from the final .config): features: Create mfd-intel-lpss feature and use where appropriate features/iio: Set IIO_BUFFER_CB to =m instead of =y features: Add 6lowpan feature and add it where necessary Tested on qemux86, qemuppc, qemumips and qemuarm. (From OE-Core rev: 18c6fb387aa6a15de514030c4a7c04dac9c68869) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.1.bb20
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.4.bb20
6 files changed, 32 insertions, 32 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 0fd78ff42e..c31692614d 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
14SRCREV_machine ?= "b1e722634976e1bcf9dc73bcbcfe3487c3fd7e4d" 14SRCREV_machine ?= "b88e2b5805213daeb0136fdd8c840dc0254a3d21"
15SRCREV_meta ?= "497e2eb5c259c4ac434d09555b33da9ed4a8667e" 15SRCREV_meta ?= "3e7c4fbbbc0ca217ddb3d3ee5235d5ad582e0c56"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ 17SRC_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
20LINUX_VERSION ?= "4.1.29" 20LINUX_VERSION ?= "4.1.30"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
index 2b10d90c2d..dc6bb9af9f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.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
14SRCREV_machine ?= "2b65eaade74b9ec3b3009a6939461ea55d646801" 14SRCREV_machine ?= "9135adcfb01432abe4a95a50fca5d0395239f798"
15SRCREV_meta ?= "b030d96c7b8c391a9e155719d649eb0f87358117" 15SRCREV_meta ?= "dab902b4cfa932810bb1dc6de003ed668f935729"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
19 19
20LINUX_VERSION ?= "4.4.15" 20LINUX_VERSION ?= "4.4.18"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${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 485843de62..72aac11690 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
5require recipes-kernel/linux/linux-yocto.inc 5require recipes-kernel/linux/linux-yocto.inc
6 6
7LINUX_VERSION ?= "4.1.29" 7LINUX_VERSION ?= "4.1.30"
8 8
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "053af7be9159a0b5a016a3e399de1484e51f26cd" 12SRCREV_machine ?= "0847ed67f89b5a8bbaaa0a7b6cfa2a99ef34834f"
13SRCREV_meta ?= "497e2eb5c259c4ac434d09555b33da9ed4a8667e" 13SRCREV_meta ?= "3e7c4fbbbc0ca217ddb3d3ee5235d5ad582e0c56"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
index 78b148c372..eb35d299df 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
@@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig"
4 4
5require recipes-kernel/linux/linux-yocto.inc 5require recipes-kernel/linux/linux-yocto.inc
6 6
7LINUX_VERSION ?= "4.4.15" 7LINUX_VERSION ?= "4.4.18"
8 8
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "ddab242999407fadae68e7ee5381b0ec6679d443" 12SRCREV_machine ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525"
13SRCREV_meta ?= "b030d96c7b8c391a9e155719d649eb0f87358117" 13SRCREV_meta ?= "dab902b4cfa932810bb1dc6de003ed668f935729"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${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 d3963f95a8..6b75a8a689 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"
11KBRANCH_qemux86-64 ?= "standard/base" 11KBRANCH_qemux86-64 ?= "standard/base"
12KBRANCH_qemumips64 ?= "standard/mti-malta64" 12KBRANCH_qemumips64 ?= "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "09b5eed6e905503646514803787d82f504013144" 14SRCREV_machine_qemuarm ?= "9c5e96205316d167379d101d808a6cda93adc335"
15SRCREV_machine_qemuarm64 ?= "053af7be9159a0b5a016a3e399de1484e51f26cd" 15SRCREV_machine_qemuarm64 ?= "0847ed67f89b5a8bbaaa0a7b6cfa2a99ef34834f"
16SRCREV_machine_qemumips ?= "582073e7a49b0847052be78254805f33635dc837" 16SRCREV_machine_qemumips ?= "9e531cb59dd7dfa2026637cc456a7bdcbdb50275"
17SRCREV_machine_qemuppc ?= "0914d10f46f22582e955b06590768ec51e8a91c3" 17SRCREV_machine_qemuppc ?= "32968ddd9357f72dfd427f5b3eda62c4a49833c7"
18SRCREV_machine_qemux86 ?= "053af7be9159a0b5a016a3e399de1484e51f26cd" 18SRCREV_machine_qemux86 ?= "0847ed67f89b5a8bbaaa0a7b6cfa2a99ef34834f"
19SRCREV_machine_qemux86-64 ?= "053af7be9159a0b5a016a3e399de1484e51f26cd" 19SRCREV_machine_qemux86-64 ?= "0847ed67f89b5a8bbaaa0a7b6cfa2a99ef34834f"
20SRCREV_machine_qemumips64 ?= "ca25d7656f7eaeb8454a182cfa38fb704ec85276" 20SRCREV_machine_qemumips64 ?= "106ed721d21c595dfb993a8990c3a29830dfc166"
21SRCREV_machine ?= "053af7be9159a0b5a016a3e399de1484e51f26cd" 21SRCREV_machine ?= "0847ed67f89b5a8bbaaa0a7b6cfa2a99ef34834f"
22SRCREV_meta ?= "497e2eb5c259c4ac434d09555b33da9ed4a8667e" 22SRCREV_meta ?= "3e7c4fbbbc0ca217ddb3d3ee5235d5ad582e0c56"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ 24SRC_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
27LINUX_VERSION ?= "4.1.29" 27LINUX_VERSION ?= "4.1.30"
28 28
29PV = "${LINUX_VERSION}+git${SRCPV}" 29PV = "${LINUX_VERSION}+git${SRCPV}"
30 30
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
index 170f34cb19..2ec62e7fd6 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
@@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base"
11KBRANCH_qemux86-64 ?= "standard/base" 11KBRANCH_qemux86-64 ?= "standard/base"
12KBRANCH_qemumips64 ?= "standard/mti-malta64" 12KBRANCH_qemumips64 ?= "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "c2507bd62854f90030433307a3d783474332f821" 14SRCREV_machine_qemuarm ?= "81cae0bb962c278b7fd616ce94b0a1ea21b9a938"
15SRCREV_machine_qemuarm64 ?= "ddab242999407fadae68e7ee5381b0ec6679d443" 15SRCREV_machine_qemuarm64 ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525"
16SRCREV_machine_qemumips ?= "e42198f28a2c3e57ef64a0f5ccfdeed906d1c257" 16SRCREV_machine_qemumips ?= "92bae966ed0bdf4bd8c8343978f83b80b8fa9981"
17SRCREV_machine_qemuppc ?= "ddab242999407fadae68e7ee5381b0ec6679d443" 17SRCREV_machine_qemuppc ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525"
18SRCREV_machine_qemux86 ?= "ddab242999407fadae68e7ee5381b0ec6679d443" 18SRCREV_machine_qemux86 ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525"
19SRCREV_machine_qemux86-64 ?= "ddab242999407fadae68e7ee5381b0ec6679d443" 19SRCREV_machine_qemux86-64 ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525"
20SRCREV_machine_qemumips64 ?= "2d0080f2350e088bdc6129c376eb9e2654a0448a" 20SRCREV_machine_qemumips64 ?= "aa125473aef74e7731b14f6b56c1b50589fcd668"
21SRCREV_machine ?= "ddab242999407fadae68e7ee5381b0ec6679d443" 21SRCREV_machine ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525"
22SRCREV_meta ?= "b030d96c7b8c391a9e155719d649eb0f87358117" 22SRCREV_meta ?= "dab902b4cfa932810bb1dc6de003ed668f935729"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
26 26
27LINUX_VERSION ?= "4.4.15" 27LINUX_VERSION ?= "4.4.18"
28 28
29PV = "${LINUX_VERSION}+git${SRCPV}" 29PV = "${LINUX_VERSION}+git${SRCPV}"
30 30