summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-03-06 13:11:14 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-08 10:39:33 -0800
commit3a8cce8b5c224710660802fba2bc0bbc97cf7385 (patch)
tree72f8ddcc8a36beeca9c0a5a042d585fb9b4ec0f2 /meta
parent266b2d16fcc7290d6fc6ff50d3ab974149bd8ebb (diff)
downloadpoky-3a8cce8b5c224710660802fba2bc0bbc97cf7385.tar.gz
linux-yocto/4.12: memleak and build warning fixes
Integrating the warning/leak fixes: 73873cb152c brd: remove unused brd_mutex 912c53b1b346 audit: fix memleak in auditd_send_unicast_skb. (From OE-Core rev: 4aec8f304216d5427f22d4a72f9f39be097513cb) 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.12.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.12.bb18
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
index 722315e843..d6ffcc86a5 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
@@ -11,8 +11,8 @@ python () {
11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "7a02176b872012f95036453dfd2e12dc0c02a612" 14SRCREV_machine ?= "27c21aed67a28d08b13c5cc1fe4287b2cf389ede"
15SRCREV_meta ?= "ca1bda8dfd3325db04dda19a531edeb66ac0d84b" 15SRCREV_meta ?= "6d6037cc054350140df49c309e155f5a7b48f480"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
index 998c017515..860b68cda6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.12.20"
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "392959d6dad698bfb62de561164c2d19e17841dd" 12SRCREV_machine ?= "073873cb152cf254d229d548c3bdcc57460a4ff0"
13SRCREV_meta ?= "ca1bda8dfd3325db04dda19a531edeb66ac0d84b" 13SRCREV_meta ?= "6d6037cc054350140df49c309e155f5a7b48f480"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb
index ca664fec5d..e1ec88bdc9 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.12.bb
@@ -11,15 +11,15 @@ 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 ?= "6155fbae7a6b42a7608b9f251fa46cef28c0fe67" 14SRCREV_machine_qemuarm ?= "c9f0aa61969279f3ff36f2bc5dcad333f1e6fe59"
15SRCREV_machine_qemuarm64 ?= "392959d6dad698bfb62de561164c2d19e17841dd" 15SRCREV_machine_qemuarm64 ?= "073873cb152cf254d229d548c3bdcc57460a4ff0"
16SRCREV_machine_qemumips ?= "d46a4aebe29dcced0fea9718c249c536ab06977f" 16SRCREV_machine_qemumips ?= "c327b2ea91c97957e865f90e7555aa4689cb5787"
17SRCREV_machine_qemuppc ?= "392959d6dad698bfb62de561164c2d19e17841dd" 17SRCREV_machine_qemuppc ?= "073873cb152cf254d229d548c3bdcc57460a4ff0"
18SRCREV_machine_qemux86 ?= "392959d6dad698bfb62de561164c2d19e17841dd" 18SRCREV_machine_qemux86 ?= "073873cb152cf254d229d548c3bdcc57460a4ff0"
19SRCREV_machine_qemux86-64 ?= "392959d6dad698bfb62de561164c2d19e17841dd" 19SRCREV_machine_qemux86-64 ?= "073873cb152cf254d229d548c3bdcc57460a4ff0"
20SRCREV_machine_qemumips64 ?= "10216660f9d902f76f36514ea4ef04530e87702d" 20SRCREV_machine_qemumips64 ?= "d25e0aa3f09dff2b8b908c7764c3c5244134d1a4"
21SRCREV_machine ?= "392959d6dad698bfb62de561164c2d19e17841dd" 21SRCREV_machine ?= "073873cb152cf254d229d548c3bdcc57460a4ff0"
22SRCREV_meta ?= "ca1bda8dfd3325db04dda19a531edeb66ac0d84b" 22SRCREV_meta ?= "6d6037cc054350140df49c309e155f5a7b48f480"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}"