From 2e01bc44f914587a2a59c2208ca0322dfb41d2c6 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 29 Apr 2019 16:06:12 -0400 Subject: 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: fdc068de3c493dea3a22bb8f91273f7b7978c639) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 6 +++--- 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 () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "a3309af7ab77156bd8d731df3a97126d3d897916" -SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3" +SRCREV_machine ?= "494384666b623a23e19cbbc54574d08e31496a03" +SRCREV_meta ?= "d26eec23cf1057a715c05777a18f395678fcbf38" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "d905ae925fc4a60d63f45e1922163da683d8a3bc" -SRCREV_machine ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" -SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3" +SRCREV_machine_qemuarm ?= "f07da0a13d6f503b72594776b5e8a9795da6d6a0" +SRCREV_machine ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382" +SRCREV_meta ?= "d26eec23cf1057a715c05777a18f395678fcbf38" PV = "${LINUX_VERSION}+git${SRCPV}" 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" KBRANCH_qemux86-64 ?= "v5.0/standard/base" KBRANCH_qemumips64 ?= "v5.0/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "17c4b7e9db4d17aa713c85d0c3d2d84af962864a" -SRCREV_machine_qemuarm64 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" -SRCREV_machine_qemumips ?= "e5c23fb31438dab373a50afc40f6e4ab0c568485" -SRCREV_machine_qemuppc ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" -SRCREV_machine_qemux86 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" -SRCREV_machine_qemux86-64 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" -SRCREV_machine_qemumips64 ?= "743d799797ad6828472087e1da8c67fdab87bf75" -SRCREV_machine ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" -SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3" +SRCREV_machine_qemuarm ?= "99f3821bdc8718af3ef6e96d594b593d644ab2e4" +SRCREV_machine_qemuarm64 ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382" +SRCREV_machine_qemumips ?= "1128cfe6c7915535c4066b75342c952640e65d72" +SRCREV_machine_qemuppc ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382" +SRCREV_machine_qemux86 ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382" +SRCREV_machine_qemux86-64 ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382" +SRCREV_machine_qemumips64 ?= "55e385d52db438df1ff7ad3845c9076b2bb221eb" +SRCREV_machine ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382" +SRCREV_meta ?= "d26eec23cf1057a715c05777a18f395678fcbf38" # remap qemuarm to qemuarma15 for the 5.0 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit v1.2.3-54-g00ecf