From bc5e0e2cceba7e1a5a963d3d904c536485f2925a Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 24 Aug 2018 14:16:22 +0000 Subject: [PATCH] sys-kernel/coreos-sources: Bump 4.17.18 to 4.17.19 --- ...kernel-4.17.18.ebuild => coreos-kernel-4.17.19.ebuild} | 0 ...dules-4.17.18.ebuild => coreos-modules-4.17.19.ebuild} | 0 .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 8 ++++---- ...urces-4.17.18.ebuild => coreos-sources-4.17.19.ebuild} | 0 ...ld-derive-relative-path-for-KBUILD_SRC-from-CURD.patch | 4 ++-- .../files/4.17/z0002-Add-arm64-coreos-verity-hash.patch | 2 +- ...s-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch | 2 +- ....x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch | 2 +- ...Revert-net-increase-fragment-memory-usage-limits.patch | 6 +++--- 9 files changed, 12 insertions(+), 12 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.17.18.ebuild => coreos-kernel-4.17.19.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.17.18.ebuild => coreos-modules-4.17.19.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.17.18.ebuild => coreos-sources-4.17.19.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.18.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.19.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.18.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.19.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.18.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.19.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.18.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.19.ebuild 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 1e9aa52b46..f8dc3addd7 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 SHA256 f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7 SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 WHIRLPOOL fee10d54ecb210156aa55364ecc15867127819e9f7ff9ec5f6ef159b1013e2ae3d3a28d35c62d663886cbe826b996a1387671766093be002536309045a8e4d10 -DIST linux-4.17.tar.xz 102165892 SHA256 9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13 SHA512 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db WHIRLPOOL 60573a6837a5daae91ea8d36f7aea0439a398d47810524df378b37df20ebb6fa83d518380348ec66cfe8f94b2405de59f884d52ac879cb4ff78f6674ad322077 -DIST patch-4.14.66.xz 1610512 SHA256 a1d0940bfae5dfdac6b11020da67b0804eaec2198bcb0c8ec9fc859e83f2813e SHA512 b81b5a39cbf27b654cc4ae22a32a49316494fd6962487fd9f3bd50543fda7cb6058f15442a04a98921cd64e5811e28c856505aff727c69a3f764cfef491c1b8b WHIRLPOOL 9857165d82960ef8a0de7a564d07a422f53916603d59fd257edb0976179ddd8758213d897fc2e336b1cfc0444776ba39e0eb45c83be3d1671336186cb97adb71 -DIST patch-4.17.18.xz 388184 SHA256 89d87b1d1a5494d8326bcf03ac07f51a4eea6a244695f60f3d38f8cb9249d16f SHA512 d3f73cca96d5bd7a2b85d070248771e8ee7de911ca34e7698325c71d28c01207cd6266879e2cddb2e924f706cd7c8f294e3a9724e7095fbbc359d17828507253 WHIRLPOOL b8a94f65388a6ecace79354386d0e0528a96ba266947ec6f58c02d8cefdf7cba1d8cda6d7da0f044af3705a6dd5adcaaae8e5f7bf7c43488a5ab530831286e59 +DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 +DIST linux-4.17.tar.xz 102165892 BLAKE2B b9e1fe2c063d2761b4d54594b841f6591fd6f5b634a402c07e0fa5518a2b271293d97c5a7a8e3c30c9c4d78df16bf20a4f0befe998c9a9393bb3290d2df1dda3 SHA512 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db +DIST patch-4.14.66.xz 1610512 BLAKE2B dedc8a750f39591ffcfc7d71d1f3883564da2d20d19b405cd1320f5eecb2c98c94b8798ac7346f09e7c745d015dbc266f972e040a346056396bd67e2a7056e2e SHA512 b81b5a39cbf27b654cc4ae22a32a49316494fd6962487fd9f3bd50543fda7cb6058f15442a04a98921cd64e5811e28c856505aff727c69a3f764cfef491c1b8b +DIST patch-4.17.19.xz 463572 BLAKE2B 6097f24f8663ade71204d83e4b89bc15f3d0b0f906cb4a0e6a9aa32705fdbd7e8855337acca37697ef93bb3f2c696ce60bab2d4e02f1e20a0113ca02c7df61a7 SHA512 57fab939df862c3807d1ddd6461b19f85b3c0aba83203f327cf174f9d6e33c79e996362cabbb44014e03fe1eb77cf0232944927ae95aa1e51ef43b153d6343ab diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.18.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.19.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.18.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.19.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/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.17/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch index df34476f2c..412afacaae 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/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.17/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch @@ -1,4 +1,4 @@ -From be536215aca0f36c6d25881a148c2edc3ce61d7b Mon Sep 17 00:00:00 2001 +From ced70717086b15f67712ed5af0d181c7e50091b9 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 Subject: [PATCH 1/5] kbuild: derive relative path for KBUILD_SRC from CURDIR @@ -12,7 +12,7 @@ by some undesirable path component. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 429a1fe0b40b..888189562233 100644 +index 32c83a163544..bcb941b51a2d 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.17/z0002-Add-arm64-coreos-verity-hash.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0002-Add-arm64-coreos-verity-hash.patch index bf89321408..9d23e3e373 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0002-Add-arm64-coreos-verity-hash.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0002-Add-arm64-coreos-verity-hash.patch @@ -1,4 +1,4 @@ -From 5914e46df50d9ffd62e7e88138bf86257d4e7420 Mon Sep 17 00:00:00 2001 +From df9d06c34425afae456b03bac53b1402035bdd9c Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 11 Nov 2016 17:28:52 -0800 Subject: [PATCH 2/5] Add arm64 coreos verity hash diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/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.17/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch index 0a46143540..6fc6180c3a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/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.17/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -1,4 +1,4 @@ -From e7d823411bafd56354ed0747eebca66d4a8ae81e Mon Sep 17 00:00:00 2001 +From 5ca710eecf0901dd693b2e7ffdb1f6dbcc743681 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 21:23:12 -0500 Subject: [PATCH 3/5] tools/objtool/Makefile: Don't fail on fallthrough with diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch index 54a1b174d9..71373a1de7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch @@ -1,4 +1,4 @@ -From d328a0f2d9ee5b710e489cee3fe26cd30ba811c8 Mon Sep 17 00:00:00 2001 +From 29cba55fd1e59016c41ffd150cf5d2c9de83f4df Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Wed, 4 Jul 2018 18:08:57 +0300 Subject: [PATCH 4/5] 4.17.x won't boot due to "x86/boot/compressed/64: Handle diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0005-Revert-net-increase-fragment-memory-usage-limits.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0005-Revert-net-increase-fragment-memory-usage-limits.patch index 8293a752c6..0953a65912 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0005-Revert-net-increase-fragment-memory-usage-limits.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0005-Revert-net-increase-fragment-memory-usage-limits.patch @@ -1,4 +1,4 @@ -From a13fc6b88f681d70205cb13ba932df72b205bcb0 Mon Sep 17 00:00:00 2001 +From 16ee70d8fa0f4a4db075f8c0e337e8c8fa3d6ab9 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 15 Aug 2018 12:50:10 -0400 Subject: [PATCH 5/5] Revert "net: increase fragment memory usage limits" @@ -10,10 +10,10 @@ This reverts commit c2a936600f78aea00d3312ea4b66a79a4619f9b4. 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/include/net/ipv6.h b/include/net/ipv6.h -index aeebbbb9e0bd..f63954d64bf2 100644 +index 62b6bfcce152..8aed05b1b482 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h -@@ -379,8 +379,8 @@ static inline bool ipv6_accept_ra(struct inet6_dev *idev) +@@ -372,8 +372,8 @@ static inline bool ipv6_accept_ra(struct inet6_dev *idev) idev->cnf.accept_ra; }