From 58d318130ac037e0eb546ea47ce0133569fe03ab Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 5 Jun 2018 13:06:16 +0000 Subject: [PATCH] sys-kernel/coreos-sources: Bump 4.16.13 to 4.16.14 --- ...ernel-4.16.13-r1.ebuild => coreos-kernel-4.16.14.ebuild} | 2 +- ...ules-4.16.13-r1.ebuild => coreos-modules-4.16.14.ebuild} | 2 +- .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 2 +- ...rces-4.16.13-r1.ebuild => coreos-sources-4.16.14.ebuild} | 0 ...uild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch | 6 +++--- .../files/4.16/z0002-Add-arm64-coreos-verity-hash.patch | 4 ++-- ...ols-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch | 4 ++-- ...vert-random-use-a-different-mixing-algorithm-for-a.patch | 4 ++-- .../4.16/z0005-Revert-random-fix-crng_ready-test.patch | 4 ++-- ...vert-xen-netfront-Fix-race-between-device-setup-an.patch | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.16.13-r1.ebuild => coreos-kernel-4.16.14.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.16.13-r1.ebuild => coreos-modules-4.16.14.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.16.13-r1.ebuild => coreos-sources-4.16.14.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.16.13-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.16.14.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.16.13-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.16.14.ebuild index b66d13b93c..77eaa0bc62 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.16.13-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.16.14.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.16.13-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.16.14.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.16.13-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.16.14.ebuild index 6c70281dca..685aa802e6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.16.13-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.16.14.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 1c0e325c2c..5192e2e636 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.16.tar.xz 103020152 SHA256 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9 SHA512 ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662 WHIRLPOOL e03466f20fbac5b54c963845449d88589cb01fcc47837adbcf7ed1fb7b74422251df3a9a83f3a74d79f086a0f2eaa3cdf3654869717c72c3fb3a195f3f721942 DIST patch-4.14.48.xz 1301644 SHA256 9ce4cc1052e613944987bd1d0ed65306176c4ce8e863da084b31d3bbccc608e9 SHA512 f87144768ba221c073f7e1fbdda340c65a7d5de28bdea492c61d8f05eedc54a3f190daa48611ead331755d2a12f8cb704399cd5a762e2227299980fecb372595 WHIRLPOOL c7f70dbf0c2a47db1b862270844d1b816b54fbaf1fb249f6a75bf022e1403ed08018deee9be66a7598a3f339afba7b9268bca4917e0ae5cbd4848135a60a82c4 -DIST patch-4.16.13.xz 375944 SHA256 9efa0a74eb61240da53bd01a3a23759e0065811de53d22de7d679eabf847f323 SHA512 f136eadbaff335b5c9cd45a9265b4ce4409c141372bc7af378c5a6bbb50330bf16d75ef29294f2b876961292c4c2606980e3d169b98e5b413d6c1b13f5eed37e WHIRLPOOL 57ef1bf382f379dc0485d85a5aa46ee233eb8d124fb660eae30d9cd278316fe3556b853dcc38f965873fa3f0081d9a70553f235c8eb013a0937eb5c86cc44af3 +DIST patch-4.16.14.xz 389868 SHA256 cc3d82b8183b641e18e4d504000d7f14873cf67d616ecdabc77383c5d9eaaac0 SHA512 5141b66352e6560058ab857e00ba72c84796e135d30cae6398de8e7cf9dfcf266fb581008d2209b0dc20d7dbbcd4e65296557acd3c806fb057dfb55850cd3975 WHIRLPOOL f33161713715466b8f5482672703a8fbd1ed2ca6f9a1671742d43b9997c834286ac5a1861d77c79424c5d3e4367ab8ad78a44d0be0b0072dc0a2c0bbffd9b902 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.16.13-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.16.14.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.16.13-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.16.14.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/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.16/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch index 5c060c83e8..ae9b12894e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/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.16/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch @@ -1,4 +1,4 @@ -From 406cf32cc9a42c02714c270d4158972525d0b283 Mon Sep 17 00:00:00 2001 +From e988d32ad0be491ed638b405803d6d90f4e0983c 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 @@ -12,7 +12,7 @@ by some undesirable path component. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 146e527a5e06..10057078b233 100644 +index a043442e442f..f4d60419fd20 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make @@ -26,5 +26,5 @@ index 146e527a5e06..10057078b233 100644 # Leave processing to above invocation of make -- -2.14.1 +2.14.4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0002-Add-arm64-coreos-verity-hash.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0002-Add-arm64-coreos-verity-hash.patch index 950af46ccc..5e32ea9b2b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0002-Add-arm64-coreos-verity-hash.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0002-Add-arm64-coreos-verity-hash.patch @@ -1,4 +1,4 @@ -From d25b1ad577bba0861ff76fcb244beac9f6c641b6 Mon Sep 17 00:00:00 2001 +From 13637bc042a3637121bb42e98afee1bcb64ffb52 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 @@ -25,5 +25,5 @@ index 613fc3000677..fdaf86c78332 100644 /* * The debug table is referenced via its Relative Virtual Address (RVA), -- -2.14.1 +2.14.4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/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.16/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch index 2916bccd85..249425aabe 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/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.16/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -1,4 +1,4 @@ -From 647f63bb965113f925c1b2063c84c818bbb90e21 Mon Sep 17 00:00:00 2001 +From bdb78a5c8dac2aa636a3e6a9a45f2919643e3607 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 @@ -23,5 +23,5 @@ index 95563b8e1ad7..307652c42a7b 100644 CFLAGS += -I$(srctree)/tools/include/ -- -2.14.1 +2.14.4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0004-Revert-random-use-a-different-mixing-algorithm-for-a.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0004-Revert-random-use-a-different-mixing-algorithm-for-a.patch index 7d7a63d35f..c603598ccc 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0004-Revert-random-use-a-different-mixing-algorithm-for-a.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0004-Revert-random-use-a-different-mixing-algorithm-for-a.patch @@ -1,4 +1,4 @@ -From b6be7c4e22349ffc406700c7a26619cac584cebb Mon Sep 17 00:00:00 2001 +From b6b0a705fb6a55b8f8eaeb4af83a344a8127dd7d Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 2 May 2018 15:16:29 -0400 Subject: [PATCH 4/6] Revert "random: use a different mixing algorithm for @@ -92,5 +92,5 @@ index 8f4e11842c60..aa5b04af86c6 100644 trace_add_device_randomness(size, _RET_IP_); spin_lock_irqsave(&input_pool.lock, flags); -- -2.14.1 +2.14.4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0005-Revert-random-fix-crng_ready-test.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0005-Revert-random-fix-crng_ready-test.patch index a2e764764d..a6fbed0654 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0005-Revert-random-fix-crng_ready-test.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0005-Revert-random-fix-crng_ready-test.patch @@ -1,4 +1,4 @@ -From 890071b67cafa1d9540aa55bc69ed6c0f75862e0 Mon Sep 17 00:00:00 2001 +From 987574c9a8aacb5037b1d2e738047362664c75e0 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 2 May 2018 15:18:03 -0400 Subject: [PATCH 5/6] Revert "random: fix crng_ready() test" @@ -60,5 +60,5 @@ index aa5b04af86c6..ef05cc685b74 100644 return; } -- -2.14.1 +2.14.4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0006-Revert-xen-netfront-Fix-race-between-device-setup-an.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0006-Revert-xen-netfront-Fix-race-between-device-setup-an.patch index f514552bd5..f0b1cd7914 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0006-Revert-xen-netfront-Fix-race-between-device-setup-an.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0006-Revert-xen-netfront-Fix-race-between-device-setup-an.patch @@ -1,4 +1,4 @@ -From 4d873796c4f77e0b9eb3881ed2524bba3402c361 Mon Sep 17 00:00:00 2001 +From d2aca47ce3032da206665265a90909ea3d4d7d92 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Wed, 30 May 2018 17:50:37 -0700 Subject: [PATCH 6/6] Revert "xen-netfront: Fix race between device setup and @@ -153,5 +153,5 @@ index 3127bc8633ca..5a37ee2372a3 100644 return 0; -- -2.14.1 +2.14.4