diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-12-21 10:49:14 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-21 16:26:52 +0000 |
commit | 253f2a1da0f4b16ce92617235cf85a72f4f79bcf (patch) | |
tree | fec6b188857a55277639a4920dd3220eaae4aa2f | |
parent | ecc393e08f42b39525121896b148d57af0e3131e (diff) | |
download | poky-253f2a1da0f4b16ce92617235cf85a72f4f79bcf.tar.gz |
linux-yocto/4.12: ipv4 stable backport and config changes
Integrating the following ipv4 backport:
ipv4: net namespace does not inherit network configurations
patch from https://lkml.org/lkml/2014/7/29/119
Ipv4 net namespace requires a similar logic change as commit a79ca223e029
[ipv6: fix bad free of addrconf_init_net] introduces for newer kernels.
Since a net namespace is independent to another. That is, there
is no any relationship between the net namespaces. So a new net
namespace should not inherit network configurations from another
net namespace including the host.
CC: Hong Zhiguo <honkiko@gmail.com>
CC: David S. Miller <davem@davemloft.net>
Signed-off-by: Zhu Yanjun <zyjzyj2000@gmail.com>
Signed-off-by: yzhu1 <yanjun.zhu@windriver.com>
Signed-off-by: Liwei Song <liwei.song@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
And the following configuration changes:
3574bb061c1b mti-malta32: enable CONFIG_HIGHMEM for qemumips to support up to 2GiB RAM
f187df8fca31 features/i915/i915.cfg: compile i915 as a module
332b38cb83a2 common-pc*.scc: Add igb to common-pc drivers
(From OE-Core rev: 7e0b87ffce90dad248a7a0f0b9d661583e047568)
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.12.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.12.bb | 18 |
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 adbb0ccbad..efa4f05bb0 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.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 ?= "82dfc739621af193e6b5cb8f27f55c66db8e631b" | 14 | SRCREV_machine ?= "51c45f6489df4cdbce78e9c90b8a26fa7e7c875c" |
15 | SRCREV_meta ?= "e3c9041f48ae980cc4461f969d0e3ed9bb43be5b" | 15 | SRCREV_meta ?= "3574bb061c1bfbdcf4df8308870c03f88ef0788f" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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 4e18d413ce..78056ee831 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.16" | |||
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 ?= "1d685baca196583254d75f5cc7bc0ffedb8753ad" | 12 | SRCREV_machine ?= "4226b065fca4f630901d99b99d18c395ae3866fb" |
13 | SRCREV_meta ?= "e3c9041f48ae980cc4461f969d0e3ed9bb43be5b" | 13 | SRCREV_meta ?= "3574bb061c1bfbdcf4df8308870c03f88ef0788f" |
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.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb index 0df702e470..90a00a513d 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" | |||
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 ?= "9f857972035c7e3ae237d25a581eb695ffe78249" | 14 | SRCREV_machine_qemuarm ?= "6227bf7bc958840e020930ac250634129919571b" |
15 | SRCREV_machine_qemuarm64 ?= "1d685baca196583254d75f5cc7bc0ffedb8753ad" | 15 | SRCREV_machine_qemuarm64 ?= "4226b065fca4f630901d99b99d18c395ae3866fb" |
16 | SRCREV_machine_qemumips ?= "6527cf00278f043ba8f874ac7262261dd57e9a79" | 16 | SRCREV_machine_qemumips ?= "16b69ee760d800e7f16a01476a24a87b66702dc6" |
17 | SRCREV_machine_qemuppc ?= "1d685baca196583254d75f5cc7bc0ffedb8753ad" | 17 | SRCREV_machine_qemuppc ?= "4226b065fca4f630901d99b99d18c395ae3866fb" |
18 | SRCREV_machine_qemux86 ?= "1d685baca196583254d75f5cc7bc0ffedb8753ad" | 18 | SRCREV_machine_qemux86 ?= "4226b065fca4f630901d99b99d18c395ae3866fb" |
19 | SRCREV_machine_qemux86-64 ?= "1d685baca196583254d75f5cc7bc0ffedb8753ad" | 19 | SRCREV_machine_qemux86-64 ?= "4226b065fca4f630901d99b99d18c395ae3866fb" |
20 | SRCREV_machine_qemumips64 ?= "ad347d33914f66c4b2aa6fca0c9f0a92773885cc" | 20 | SRCREV_machine_qemumips64 ?= "4eb2f843b67a8e97619689991b566808212a3677" |
21 | SRCREV_machine ?= "1d685baca196583254d75f5cc7bc0ffedb8753ad" | 21 | SRCREV_machine ?= "4226b065fca4f630901d99b99d18c395ae3866fb" |
22 | SRCREV_meta ?= "e3c9041f48ae980cc4461f969d0e3ed9bb43be5b" | 22 | SRCREV_meta ?= "3574bb061c1bfbdcf4df8308870c03f88ef0788f" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_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}" |