diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.67-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.68.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.67-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.68.ebuild index 91a8d6e66e..390f180fee 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.67-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.68.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -COREOS_SOURCE_REVISION="-r1" +COREOS_SOURCE_REVISION="" inherit coreos-kernel DESCRIPTION="CoreOS Linux kernel" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.67-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.68.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.67-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.68.ebuild index 2ec41a9dc5..bba80e7e2d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.67-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.68.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -COREOS_SOURCE_REVISION="-r1" +COREOS_SOURCE_REVISION="" inherit coreos-kernel savedconfig DESCRIPTION="CoreOS Linux kernel modules" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest index 44f1db13ad..15e8926f66 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest @@ -1,4 +1,4 @@ DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 DIST linux-4.18.tar.xz 101781564 BLAKE2B 138bdc49dc8871e5566b5e23a9e5ed0e68fff480a7a04fc659a9efe2d4bcc778ac01368a32bc5d1dbde870102ce7294b9d315f81c4e6e762ee781135e83033f2 SHA512 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038 -DIST patch-4.14.67.xz 1650468 BLAKE2B 538e1abaa2401fb988be642a1c80e23821f7132e821322c1c82ad8c0ba3f3ff7f68713ee7b9a3d5a391d2ada9c08db2cc799e45f36d10df1abd839c20eb27dfc SHA512 fa55874353fb4aec12fc50d39e24ebfebcbcdf84f8602511f6bb5afca9585e4be63691599bed29a97e34901487f380bc1bcdb260e14b3709c81c715fa86e8579 +DIST patch-4.14.68.xz 1684056 BLAKE2B f3e3de8f642f6c06edeaefd644cdbf3cdaae07c8642dd7e61b4962737cba9d60c3f035358ad2328ca17d6d583a1534d7c2b3506e06b4bb03a870c2ae8ea8c695 SHA512 20980a89e944664bd35cd17039bcc161fceb8e2afad376810936b99aa67c3c17a21aa753e890dd71e0cebade84971dd1f236bde2bc21826c0a8380c3cc9e9d1c DIST patch-4.18.6.xz 100104 BLAKE2B 3f78b60b54a1554f59f0b0a175e5441cd706da7ee4d0c43031bc6000b0df1943a62162e8cf5edb36006867acf3b21982c646c688df7fc4542bcd9d43f63809ef SHA512 9fe507cfc549e02fc52580cafa7a663522d3793830d2ac7e7f7686f68c20928b91395849cf5387831f79e42affe292665cb360541390be666987b3a0bab5ee1e diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.67-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.68.ebuild similarity index 78% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.67-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.68.ebuild index 56b3690835..dc1115d772 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.67-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.68.ebuild @@ -32,9 +32,8 @@ IUSE="" # local patches overlap with the upstream patch. UNIPATCH_LIST=" ${PATCH_DIR}/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch \ - ${PATCH_DIR}/z0002-Add-arm64-coreos-verity-hash.patch \ - ${PATCH_DIR}/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \ - ${PATCH_DIR}/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch \ - ${PATCH_DIR}/z0005-xen-netfront-Update-features-after-registering-netde.patch \ - ${PATCH_DIR}/z0006-Revert-net-increase-fragment-memory-usage-limits.patch \ + ${PATCH_DIR}/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \ + ${PATCH_DIR}/z0003-xen-netfront-Fix-mismatched-rtnl_unlock.patch \ + ${PATCH_DIR}/z0004-xen-netfront-Update-features-after-registering-netde.patch \ + ${PATCH_DIR}/z0005-Revert-net-increase-fragment-memory-usage-limits.patch \ " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch index 0de1a0d674..3e29b63a8c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch @@ -1,7 +1,7 @@ -From c8711a25220225683ee97840a4ba5d4607ef6b8b Mon Sep 17 00:00:00 2001 +From 31f12f7bf7bfe32809940b5fd91ae5afe4c92118 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 -Subject: [PATCH 1/6] kbuild: derive relative path for KBUILD_SRC from CURDIR +Subject: [PATCH 1/5] kbuild: derive relative path for KBUILD_SRC from CURDIR This enables relocating source and build trees to different roots, provided they stay reachable relative to one another. Useful for @@ -12,7 +12,7 @@ by some undesirable path component. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 4dad2d1c24ba..ac58aab76f68 100644 +index 3da579058926..89856b408086 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch deleted file mode 100644 index b0477b01f5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ffe76c45dc298b38db028c8b3306943a9523a16c Mon Sep 17 00:00:00 2001 -From: Geoff Levand -Date: Fri, 11 Nov 2016 17:28:52 -0800 -Subject: [PATCH 2/6] Add arm64 coreos verity hash - -Signed-off-by: Geoff Levand ---- - arch/arm64/kernel/efi-header.S | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/arch/arm64/kernel/efi-header.S b/arch/arm64/kernel/efi-header.S -index 613fc3000677..fdaf86c78332 100644 ---- a/arch/arm64/kernel/efi-header.S -+++ b/arch/arm64/kernel/efi-header.S -@@ -103,6 +103,11 @@ section_table: - - .set section_count, (. - section_table) / 40 - -+ /* CoreOS 64 byte verity hash value. */ -+ .org _head + 512 -+ .ascii "verity-hash" -+ .org _head + 512 + 64 -+ - #ifdef CONFIG_DEBUG_EFI - /* - * The debug table is referenced via its Relative Virtual Address (RVA), --- -2.17.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch similarity index 83% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch index e10e9aa2ac..c707d4913e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -1,7 +1,7 @@ -From 53b1565b99be431a49b75d3fb1bc079b0a047870 Mon Sep 17 00:00:00 2001 +From 21ab82366dac9712d3100d8b56e48582cba9c548 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 21:23:12 -0500 -Subject: [PATCH 3/6] tools/objtool/Makefile: Don't fail on fallthrough with +Subject: [PATCH 2/5] tools/objtool/Makefile: Don't fail on fallthrough with new GCCs --- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-xen-netfront-Fix-mismatched-rtnl_unlock.patch similarity index 89% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-xen-netfront-Fix-mismatched-rtnl_unlock.patch index 47057ec635..555b942613 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-xen-netfront-Fix-mismatched-rtnl_unlock.patch @@ -1,7 +1,7 @@ -From e8511747092c0c606c60c2c3678e440758f73e36 Mon Sep 17 00:00:00 2001 +From 5332d3c0d0f3f96e9da99e2511e51d0a14f5911b Mon Sep 17 00:00:00 2001 From: Ross Lagerwall Date: Thu, 21 Jun 2018 14:00:20 +0100 -Subject: [PATCH 4/6] xen-netfront: Fix mismatched rtnl_unlock +Subject: [PATCH 3/5] xen-netfront: Fix mismatched rtnl_unlock Fixes: f599c64fdf7d ("xen-netfront: Fix race between device setup and open") Reported-by: Ben Hutchings diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-xen-netfront-Update-features-after-registering-netde.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-xen-netfront-Update-features-after-registering-netde.patch similarity index 92% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-xen-netfront-Update-features-after-registering-netde.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-xen-netfront-Update-features-after-registering-netde.patch index 737d849e10..137c7ae45f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-xen-netfront-Update-features-after-registering-netde.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-xen-netfront-Update-features-after-registering-netde.patch @@ -1,7 +1,7 @@ -From 190d59068f0cd28f18d618c5ff14f683d79bd58b Mon Sep 17 00:00:00 2001 +From b60cc8a48990259d9ff23b1a7b0e3cba3a6dc616 Mon Sep 17 00:00:00 2001 From: Ross Lagerwall Date: Thu, 21 Jun 2018 14:00:21 +0100 -Subject: [PATCH 5/6] xen-netfront: Update features after registering netdev +Subject: [PATCH 4/5] xen-netfront: Update features after registering netdev Update the features after calling register_netdev() otherwise the device features are not set up correctly and it not possible to change diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-Revert-net-increase-fragment-memory-usage-limits.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-Revert-net-increase-fragment-memory-usage-limits.patch similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-Revert-net-increase-fragment-memory-usage-limits.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-Revert-net-increase-fragment-memory-usage-limits.patch index e15382ca3a..0b84e2346f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-Revert-net-increase-fragment-memory-usage-limits.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-Revert-net-increase-fragment-memory-usage-limits.patch @@ -1,7 +1,7 @@ -From 2fab52938039e0b40f177bda0bb178b311314f1c Mon Sep 17 00:00:00 2001 +From 623a00a820faa8be974e749e54ec74f89a8e3086 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 15 Aug 2018 12:43:38 -0400 -Subject: [PATCH 6/6] Revert "net: increase fragment memory usage limits" +Subject: [PATCH 5/5] Revert "net: increase fragment memory usage limits" This reverts commit c2a936600f78aea00d3312ea4b66a79a4619f9b4. ---