diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-04-29 16:06:12 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-30 12:05:23 +0100 |
commit | 1165edbe508239d4fd21b49d7d52c7f4734ada5a (patch) | |
tree | e7af2ba1dbcc0b767eb03a8ba6d4c2fea5067ba2 /meta/recipes-kernel | |
parent | 1e8cedab4410923ccd815c5991b3df0b642a36e1 (diff) | |
download | poky-1165edbe508239d4fd21b49d7d52c7f4734ada5a.tar.gz |
linux-yocto/5.0: update TCP patch to mainline version
Updating the SRCREVs to drop our temporary workaround for TCP
timeout issues and switch to the mainline version:
tcp: add sanity tests in tcp_add_backlog()
Revert "tcp: fix issues relaed to implement coalescing on backlog queue"
(From OE-Core rev: 07db18609ce2b868d4ff5eb6cf2128bf6eb6d682)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.0.bb | 18 |
3 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb index ef3f0a0e1b..54f86dac92 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.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 | ||
14 | SRCREV_machine ?= "a3309af7ab77156bd8d731df3a97126d3d897916" | 14 | SRCREV_machine ?= "494384666b623a23e19cbbc54574d08e31496a03" |
15 | SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3" | 15 | SRCREV_meta ?= "d26eec23cf1057a715c05777a18f395678fcbf38" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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-5.0;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb index 206e6c348d..720192152b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | |||
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" | |||
15 | KMETA = "kernel-meta" | 15 | KMETA = "kernel-meta" |
16 | KCONF_BSP_AUDIT_LEVEL = "2" | 16 | KCONF_BSP_AUDIT_LEVEL = "2" |
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "d905ae925fc4a60d63f45e1922163da683d8a3bc" | 18 | SRCREV_machine_qemuarm ?= "f07da0a13d6f503b72594776b5e8a9795da6d6a0" |
19 | SRCREV_machine ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" | 19 | SRCREV_machine ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382" |
20 | SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3" | 20 | SRCREV_meta ?= "d26eec23cf1057a715c05777a18f395678fcbf38" |
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_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb index 4ccf907ac5..ae8f643e9f 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb | |||
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v5.0/standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "v5.0/standard/base" | 11 | KBRANCH_qemux86-64 ?= "v5.0/standard/base" |
12 | KBRANCH_qemumips64 ?= "v5.0/standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "v5.0/standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "17c4b7e9db4d17aa713c85d0c3d2d84af962864a" | 14 | SRCREV_machine_qemuarm ?= "99f3821bdc8718af3ef6e96d594b593d644ab2e4" |
15 | SRCREV_machine_qemuarm64 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" | 15 | SRCREV_machine_qemuarm64 ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382" |
16 | SRCREV_machine_qemumips ?= "e5c23fb31438dab373a50afc40f6e4ab0c568485" | 16 | SRCREV_machine_qemumips ?= "1128cfe6c7915535c4066b75342c952640e65d72" |
17 | SRCREV_machine_qemuppc ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" | 17 | SRCREV_machine_qemuppc ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382" |
18 | SRCREV_machine_qemux86 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" | 18 | SRCREV_machine_qemux86 ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382" |
19 | SRCREV_machine_qemux86-64 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" | 19 | SRCREV_machine_qemux86-64 ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382" |
20 | SRCREV_machine_qemumips64 ?= "743d799797ad6828472087e1da8c67fdab87bf75" | 20 | SRCREV_machine_qemumips64 ?= "55e385d52db438df1ff7ad3845c9076b2bb221eb" |
21 | SRCREV_machine ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" | 21 | SRCREV_machine ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382" |
22 | SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3" | 22 | SRCREV_meta ?= "d26eec23cf1057a715c05777a18f395678fcbf38" |
23 | 23 | ||
24 | # remap qemuarm to qemuarma15 for the 5.0 kernel | 24 | # remap qemuarm to qemuarma15 for the 5.0 kernel |
25 | # KMACHINE_qemuarm ?= "qemuarma15" | 25 | # KMACHINE_qemuarm ?= "qemuarma15" |