Merge pull request #3390 from bgilbert/4.18

sys-kernel/coreos-*: Bump 4.17.19 to 4.18.5

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.18.5.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"

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.18.5.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"

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.18

@@ -186,7 +186,6 @@ CONFIG_PROFILING=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_KRETPROBES=y
-CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_SIG=y
@@ -320,16 +319,11 @@ CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_SET=m
 CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_META=m
-CONFIG_NFT_RT=m
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_SET_RBTREE=m
-CONFIG_NFT_SET_HASH=m
-CONFIG_NFT_SET_BITMAP=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -507,7 +501,6 @@ CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
 CONFIG_NF_TABLES_BRIDGE=y
-CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
@@ -970,7 +963,7 @@ CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_FSCACHE=m

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.17.tar.xz 102165892 BLAKE2B b9e1fe2c063d2761b4d54594b841f6591fd6f5b634a402c07e0fa5518a2b271293d97c5a7a8e3c30c9c4d78df16bf20a4f0befe998c9a9393bb3290d2df1dda3 SHA512 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
+DIST linux-4.18.tar.xz 101781564 SHA256 19d8bcf49ef530cd4e364a45b4a22fa70714b70349c8100e7308488e26f1eaf1 SHA512 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038 WHIRLPOOL c92a82a435d730e8b3c90a8e92069b113d8b88d4f6dad4d4832008577ae435c8b1fd974f19fe880ee6947f6f3c8b54d87ff5dcd90de0c4cf49bc4b9899dd763a
 DIST patch-4.14.67.xz 1650468 BLAKE2B 538e1abaa2401fb988be642a1c80e23821f7132e821322c1c82ad8c0ba3f3ff7f68713ee7b9a3d5a391d2ada9c08db2cc799e45f36d10df1abd839c20eb27dfc SHA512 fa55874353fb4aec12fc50d39e24ebfebcbcdf84f8602511f6bb5afca9585e4be63691599bed29a97e34901487f380bc1bcdb260e14b3709c81c715fa86e8579
-DIST patch-4.17.19.xz 463572 BLAKE2B 6097f24f8663ade71204d83e4b89bc15f3d0b0f906cb4a0e6a9aa32705fdbd7e8855337acca37697ef93bb3f2c696ce60bab2d4e02f1e20a0113ca02c7df61a7 SHA512 57fab939df862c3807d1ddd6461b19f85b3c0aba83203f327cf174f9d6e33c79e996362cabbb44014e03fe1eb77cf0232944927ae95aa1e51ef43b153d6343ab
+DIST patch-4.18.5.xz 58136 SHA256 c88a4e56ab8a37e38c76dbb12be53a2a3379e920ce4b86003ccfff8a4a9d1f69 SHA512 b7c1457b92051d79a6dfe1d1acbe3e9cf589ba1aac0db61d76a500f0966854307c35e91016b6175f2a863a4cd63e0c99fa879eea2e5467d38e86afa44bfcfd52 WHIRLPOOL 5c5b6d5a60ca4d18448cb41bfb69938e6f583b645435bcfdf4d14673076bc3efd45dd513a73036f73fad96885e87a96cea6dfd4569ede1d4395abb3b8c402fe7

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.18.5.ebuild

@@ -8,7 +8,7 @@ ETYPE="sources"
 # Final releases should be versioned L.M.N, even for N == 0
 
 # Only needed for RCs
-K_BASE_VER="4.17"
+K_BASE_VER="4.18"
 
 inherit kernel-2
 detect_version
@@ -36,8 +36,7 @@ RDEPEND+="
 # 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}/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \
-	${PATCH_DIR}/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \
+	${PATCH_DIR}/z0003-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch \
-	${PATCH_DIR}/z0004-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch \
+	${PATCH_DIR}/z0004-Revert-net-increase-fragment-memory-usage-limits.patch \
-	${PATCH_DIR}/z0005-Revert-net-increase-fragment-memory-usage-limits.patch \
 "

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0002-Add-arm64-coreos-verity-hash.patch

@@ -1,29 +0,0 @@
-From df9d06c34425afae456b03bac53b1402035bdd9c Mon Sep 17 00:00:00 2001
-From: Geoff Levand <geoff@infradead.org>
-Date: Fri, 11 Nov 2016 17:28:52 -0800
-Subject: [PATCH 2/5] Add arm64 coreos verity hash
-
-Signed-off-by: Geoff Levand <geoff@infradead.org>
----
- 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
-

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch

@@ -1,7 +1,7 @@
-From ced70717086b15f67712ed5af0d181c7e50091b9 Mon Sep 17 00:00:00 2001
+From 9820b45b73f76fd0edc66ba0d49bf6dd5431312c Mon Sep 17 00:00:00 2001
 From: Vito Caputo <vito.caputo@coreos.com>
 Date: Wed, 25 Nov 2015 02:59:45 -0800
-Subject: [PATCH 1/5] kbuild: derive relative path for KBUILD_SRC from CURDIR
+Subject: [PATCH 1/4] 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 32c83a163544..bcb941b51a2d 100644
+index a41692c5827a..5ab95f6f053c 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch

@@ -1,7 +1,7 @@
-From 5ca710eecf0901dd693b2e7ffdb1f6dbcc743681 Mon Sep 17 00:00:00 2001
+From cf3c9b4dc60f6e286b091075fe17e244d5e3262b Mon Sep 17 00:00:00 2001
 From: David Michael <david.michael@coreos.com>
 Date: Thu, 8 Feb 2018 21:23:12 -0500
-Subject: [PATCH 3/5] tools/objtool/Makefile: Don't fail on fallthrough with
+Subject: [PATCH 2/4] tools/objtool/Makefile: Don't fail on fallthrough with
  new GCCs
 
 ---

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/z0003-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch

@@ -1,7 +1,7 @@
-From 29cba55fd1e59016c41ffd150cf5d2c9de83f4df Mon Sep 17 00:00:00 2001
+From 3697cb63e5f6d703de6e517fd26e7628f0fd0ef1 Mon Sep 17 00:00:00 2001
 From: "Kirill A. Shutemov" <kirill@shutemov.name>
 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
+Subject: [PATCH 3/4] 4.17.x won't boot due to "x86/boot/compressed/64: Handle
  5-level paging boot if kernel is above 4G"
 
 On Tue, Jul 03, 2018 at 05:21:50PM +0300, Kirill A. Shutemov wrote:
@@ -49,7 +49,7 @@ Hm?
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
-index fa42f895fdde..4f24baa8cdeb 100644
+index 169c2feda14a..01b237707498 100644
 --- a/arch/x86/boot/compressed/Makefile
 +++ b/arch/x86/boot/compressed/Makefile
 @@ -42,16 +42,16 @@ KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/z0004-Revert-net-increase-fragment-memory-usage-limits.patch

@@ -1,7 +1,7 @@
-From 16ee70d8fa0f4a4db075f8c0e337e8c8fa3d6ab9 Mon Sep 17 00:00:00 2001
+From c2f4bef23e9896daf985396ccfebae07bb2ede22 Mon Sep 17 00:00:00 2001
 From: David Michael <dm0@redhat.com>
 Date: Wed, 15 Aug 2018 12:50:10 -0400
-Subject: [PATCH 5/5] Revert "net: increase fragment memory usage limits"
+Subject: [PATCH 4/4] Revert "net: increase fragment memory usage limits"
 
 This reverts commit c2a936600f78aea00d3312ea4b66a79a4619f9b4.
 ---
@@ -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 62b6bfcce152..8aed05b1b482 100644
+index 8f73be494503..04a865cb4a83 100644
 --- a/include/net/ipv6.h
 +++ b/include/net/ipv6.h
-@@ -372,8 +372,8 @@ static inline bool ipv6_accept_ra(struct inet6_dev *idev)
+@@ -373,8 +373,8 @@ static inline bool ipv6_accept_ra(struct inet6_dev *idev)
  	    idev->cnf.accept_ra;
  }