From 36087120c41fb51a127c28048294aeb330d7a44c Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 3 Jul 2018 12:55:52 +0000 Subject: [PATCH] sys-kernel/coreos-sources: Bump 4.17.3 to 4.17.4 --- ...eos-kernel-4.17.3.ebuild => coreos-kernel-4.17.4.ebuild} | 0 ...s-modules-4.17.3.ebuild => coreos-modules-4.17.4.ebuild} | 0 .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 2 +- ...s-sources-4.17.3.ebuild => coreos-sources-4.17.4.ebuild} | 0 ...uild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch | 6 +++--- .../files/4.17/z0002-Add-arm64-coreos-verity-hash.patch | 4 ++-- ...ols-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch | 4 ++-- .../z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch | 4 ++-- ...n-netfront-Update-features-after-registering-netde.patch | 4 ++-- ...vert-x86-boot-compressed-64-Handle-5-level-paging-.patch | 6 +++--- 10 files changed, 15 insertions(+), 15 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.17.3.ebuild => coreos-kernel-4.17.4.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.17.3.ebuild => coreos-modules-4.17.4.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.17.3.ebuild => coreos-sources-4.17.4.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.4.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.4.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 3c25c70895..37f8072417 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.52.xz 1373656 SHA256 02afce8ee5d78452589ad7bb23c7d7c94d18f9c346594088b36d67e0b0f62275 SHA512 720b310700337d7c8b77b78592aae6c8d9bd08cb4da0437110ddcdf4e9e8146367293a2f2d94325787b5f201a09847badb50657082426212b610f6993eefc536 WHIRLPOOL adb86e001c2ef778a2de096184729086723ef2c5d0792824c70f7fcc63a10cc63f3bb62b34c49bce817d274ba677223d5bcae6ba8d70f25de413a6ec793ffa95 -DIST patch-4.17.3.xz 47420 SHA256 01d5cc024dcfed615f84fd83be9c248261d8fc2c062520d38397cead6857b596 SHA512 c0b3dfb1c1d64edc74cb3b35a4d6160ccf80b5b58d19e5a11dde372ab515c350576f8981b3816e4e8689da38b792eb85b3ef46581d65d7c51c72943dea7409f4 WHIRLPOOL 3f35cad858d1905c1d620cdce7acfd3158539d66594877717089f67f95014568bd9655ff2cf6862b00843070d95f55a89c930e082bcd3975d46699cb398eaa98 +DIST patch-4.17.4.xz 106416 SHA256 b4b4b60d2f20f9b84ba8e55e2099102ad5b9460115bf31f4bab5c161451c0e3d SHA512 0a9f976e7cf2c2cc9ba29b5eb45a6b9722059674efa99153bf449537e022426138a0848cfdb69e1df4a1a3b71ee7c9de92b4086799d0e15f44f8356b2fd63754 WHIRLPOOL 286eee55e0a082a4fcd1b8149b643dd3dbc16f868813d29d765889221c056253ff52eb819977667873d964355b0d04aa4e0f72b84531588d7e09f82fe007082a diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.4.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 e09ae036d4..6f56d1539b 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 e83d7983c35e86f1c4a44748c4a5e7fd1bb16c69 Mon Sep 17 00:00:00 2001 +From 34e228f8e6e7158bbba004f09e4dcccbdde90dd9 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 31dc3a08295a..fdb91172fa9b 100644 +index 1d740dbe676d..26e918047433 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 31dc3a08295a..fdb91172fa9b 100644 # Leave processing to above invocation of make -- -2.17.1 +2.14.4 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 e06d24d1b2..ff6aed6bc8 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 b417f8704384d32d6c0d5790f209f09d7323560f Mon Sep 17 00:00:00 2001 +From 61be08a7e38f59aaec53e8db6a6aaece83d2dba5 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.17.1 +2.14.4 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 937bac1cd6..72ec6a8514 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 8d858ab31cb9f1fd77a636e911284992421ef225 Mon Sep 17 00:00:00 2001 +From f0dbb5570e089e05503a1bf809cb332e7b8fbd7f 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.17.1 +2.14.4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch index 5daa64f393..dac201692e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch @@ -1,4 +1,4 @@ -From cd4d6483723ea3185f97a6896b006b2582baaad5 Mon Sep 17 00:00:00 2001 +From 32d9da78f1a09d13dc44791dd99a476d014c1fda 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 @@ -34,5 +34,5 @@ index 4dd0668003e7..244095bfd604 100644 return err; } -- -2.17.1 +2.14.4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0005-xen-netfront-Update-features-after-registering-netde.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0005-xen-netfront-Update-features-after-registering-netde.patch index 11d6016bb7..1cff619ab6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0005-xen-netfront-Update-features-after-registering-netde.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0005-xen-netfront-Update-features-after-registering-netde.patch @@ -1,4 +1,4 @@ -From 64dca404996f00e7df2b829e471c687286e8e847 Mon Sep 17 00:00:00 2001 +From f473198fd5ca6c586c3e07fddf50aaa2af7c166a 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 @@ -45,5 +45,5 @@ index 244095bfd604..1d5082d30187 100644 * All public and private state should now be sane. Get * ready to start sending and receiving packets and give the driver -- -2.17.1 +2.14.4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0006-Revert-x86-boot-compressed-64-Handle-5-level-paging-.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0006-Revert-x86-boot-compressed-64-Handle-5-level-paging-.patch index 969253cf9c..e2a080c75d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0006-Revert-x86-boot-compressed-64-Handle-5-level-paging-.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0006-Revert-x86-boot-compressed-64-Handle-5-level-paging-.patch @@ -1,4 +1,4 @@ -From 8a18baaaff11b8758d738e4325fbe77476191446 Mon Sep 17 00:00:00 2001 +From 6694ab807f21e64d43e13a884b35eae44dd9a59f Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sun, 1 Jul 2018 12:13:35 -0700 Subject: [PATCH 6/6] Revert "x86/boot/compressed/64: Handle 5-level paging @@ -7,7 +7,7 @@ Subject: [PATCH 6/6] Revert "x86/boot/compressed/64: Handle 5-level paging This reverts commit 194a9749c73d650c0b1dfdee04fb0bdf0a888ba8, which causes instantaneous and silent boot failures. --- - arch/x86/boot/compressed/head_64.S | 69 +++++++----------------------- + arch/x86/boot/compressed/head_64.S | 69 +++++++++----------------------------- 1 file changed, 16 insertions(+), 53 deletions(-) diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S @@ -128,5 +128,5 @@ index 8169e8b7a4dc..7588e65a9c4a 100644 hlt jmp 1b -- -2.17.1 +2.14.4