summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-12-16 22:38:18 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-08 20:14:43 +0000
commite662a84379bf531ed650ab457332981d2cd8d117 (patch)
tree5d1157a8ced121799445feccf07c912c2f1f1d1a /meta
parent5114d69d95083bc719985069d62bdb1fe731db94 (diff)
downloadpoky-e662a84379bf531ed650ab457332981d2cd8d117.tar.gz
linux-yocto/4.18: bug fixes and configuration tweaks
Integrating the following commits: 2ba9a28434f8 netfilter: use kvmalloc_array to allocate memory for hashtable 6e1fae5d233a ipv4: net namespace does not inherit network configurations As well as the following configuration changes: ed1978c99214 features/module-signing: add new feature a28fd4843381 edac: Drop CONFIG_EDAC_MM_EDAC and add dependency 8ae63963256e xfs: add xfs support (From OE-Core rev: d88ce948ff2c910e796b78be388bec9578f6eb9c) (From OE-Core rev: 13aa70bbcd508816dd9452a86afd2e198bc1841d) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.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.18.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.18.bb18
3 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
index 2a92a69b5f..cd685bd5b6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.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 ?= "cab37ca8426b490e995a9614f15448e135399993" 14SRCREV_machine ?= "8334c6cfdac2036631caa877ffad8d3ec424a265"
15SRCREV_meta ?= "e39413ec2bdda10cdfb7e7e4df228be8d39e6639" 15SRCREV_meta ?= "ed1978c99214b03740a8989d46f175252435ddc2"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
index 968b94c207..145992e5d7 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "33859b3077c83d8a024946ba06a59990546fcbc7" 18SRCREV_machine_qemuarm ?= "fad657599d15977f1ecb5cdf1719526dacf5f529"
19SRCREV_machine ?= "33859b3077c83d8a024946ba06a59990546fcbc7" 19SRCREV_machine ?= "2ba9a28434f83c917ad3cfb8b4f7db6066c26a99"
20SRCREV_meta ?= "e39413ec2bdda10cdfb7e7e4df228be8d39e6639" 20SRCREV_meta ?= "ed1978c99214b03740a8989d46f175252435ddc2"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.18.bb b/meta/recipes-kernel/linux/linux-yocto_4.18.bb
index da0f076c92..70fadcc104 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.18.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v4.18/standard/base"
11KBRANCH_qemux86-64 ?= "v4.18/standard/base" 11KBRANCH_qemux86-64 ?= "v4.18/standard/base"
12KBRANCH_qemumips64 ?= "v4.18/standard/mti-malta64" 12KBRANCH_qemumips64 ?= "v4.18/standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "0573ed3c737c82b24fd661cc5ea961cac07ea2fe" 14SRCREV_machine_qemuarm ?= "285677060e108d00ed786b5347d447807d94a963"
15SRCREV_machine_qemuarm64 ?= "33859b3077c83d8a024946ba06a59990546fcbc7" 15SRCREV_machine_qemuarm64 ?= "2ba9a28434f83c917ad3cfb8b4f7db6066c26a99"
16SRCREV_machine_qemumips ?= "465252ba0ec00ae10397cb4623c3d77c89e542a5" 16SRCREV_machine_qemumips ?= "cbfe1fd6157ff4a1497dad50164bd493cb680f17"
17SRCREV_machine_qemuppc ?= "33859b3077c83d8a024946ba06a59990546fcbc7" 17SRCREV_machine_qemuppc ?= "2ba9a28434f83c917ad3cfb8b4f7db6066c26a99"
18SRCREV_machine_qemux86 ?= "33859b3077c83d8a024946ba06a59990546fcbc7" 18SRCREV_machine_qemux86 ?= "2ba9a28434f83c917ad3cfb8b4f7db6066c26a99"
19SRCREV_machine_qemux86-64 ?= "33859b3077c83d8a024946ba06a59990546fcbc7" 19SRCREV_machine_qemux86-64 ?= "2ba9a28434f83c917ad3cfb8b4f7db6066c26a99"
20SRCREV_machine_qemumips64 ?= "6d91dc62811f4688efc67845185858645b4ccfb8" 20SRCREV_machine_qemumips64 ?= "090c1efbf5d1e9267f73eec102a53ea7b155d7c1"
21SRCREV_machine ?= "33859b3077c83d8a024946ba06a59990546fcbc7" 21SRCREV_machine ?= "2ba9a28434f83c917ad3cfb8b4f7db6066c26a99"
22SRCREV_meta ?= "e39413ec2bdda10cdfb7e7e4df228be8d39e6639" 22SRCREV_meta ?= "ed1978c99214b03740a8989d46f175252435ddc2"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}"