diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.53.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.54.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.53.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.54.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.53.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.54.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.53.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.54.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 ca67520a94..095e1ec58b 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.53.xz 1413924 SHA256 fa2b79bfa6f07515d2e59687af249552f4e1ee4382d0e7782f82ad3d5308fdd2 SHA512 13184112b114b30d0c6a18a87e846650e0504e68d1be249f684828d2cbe9e5f3bfad919f3e2c9adc74afa77e15c5553b96490857eb0aca2e5f15ec63c83c702f WHIRLPOOL 2f8262bcf934fb2f708da276197a4a40127638a5474b54b4640008f11ae6ccf623eaeb5a6c56106cc1dbb966c11c0e12e4159e6dca490babf4020bae80c2c094 +DIST patch-4.14.54.xz 1431256 SHA256 4e2b1ba719ccced76ff8b2f9854352cef2be7d719cd19004278fa3d88b4ff345 SHA512 9a10b551c80c3670221e803e40f6bec70ca09a95bead328bd390d2d029abcdb216334d5178c54d0128e8cd6e4ae197ccb2c053d7c643c5665f04afa56857f03c WHIRLPOOL c2215b8d436a4d2d945221944f88b0bc7ef5d702066ab8d84cb8c9d6de590263fdb2f8397b6af3f97239ff8388252415d2676a44bff4c4ba1df75b671521491c 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.14.53.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.54.ebuild similarity index 83% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.53.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.54.ebuild index 2d610a2558..ad85c5dc02 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.53.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.54.ebuild @@ -36,8 +36,6 @@ UNIPATCH_LIST=" ${PATCH_DIR}/z0003-block-factor-out-__blkdev_issue_zero_pages.patch \ ${PATCH_DIR}/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch \ ${PATCH_DIR}/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \ - ${PATCH_DIR}/z0006-Revert-random-use-a-different-mixing-algorithm-for-a.patch \ - ${PATCH_DIR}/z0007-Revert-random-fix-crng_ready-test.patch \ - ${PATCH_DIR}/z0008-xen-netfront-Fix-mismatched-rtnl_unlock.patch \ - ${PATCH_DIR}/z0009-xen-netfront-Update-features-after-registering-netde.patch \ + ${PATCH_DIR}/z0006-xen-netfront-Fix-mismatched-rtnl_unlock.patch \ + ${PATCH_DIR}/z0007-xen-netfront-Update-features-after-registering-netde.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 9db55cb083..c8c86489c2 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 249667818618118ba9add03ac786165b4c627d85 Mon Sep 17 00:00:00 2001 +From d98e489fc3a08b0e60e19150c5d72c94207931c0 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 -Subject: [PATCH 1/9] kbuild: derive relative path for KBUILD_SRC from CURDIR +Subject: [PATCH 1/7] 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 fb66998408f4..a1abcc84f53d 100644 +index de0955d8dfa3..402430c92f71 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 index c32f8c201b..b92137cbf4 100644 --- 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 @@ -1,7 +1,7 @@ -From 6865524c9727dc7708630460419626b577c84d6c Mon Sep 17 00:00:00 2001 +From 541ba5ec5f1afa4b9de869f43649354167357510 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 11 Nov 2016 17:28:52 -0800 -Subject: [PATCH 2/9] Add arm64 coreos verity hash +Subject: [PATCH 2/7] Add arm64 coreos verity hash Signed-off-by: Geoff Levand --- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-block-factor-out-__blkdev_issue_zero_pages.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-block-factor-out-__blkdev_issue_zero_pages.patch index eae135f3f8..b5a5887034 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-block-factor-out-__blkdev_issue_zero_pages.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-block-factor-out-__blkdev_issue_zero_pages.patch @@ -1,7 +1,7 @@ -From 74826182d11bef2af7e1b62c7f5bb0f2dea2ca7f Mon Sep 17 00:00:00 2001 +From 61bf1629dc96063f2638ea9604a31e48348d6944 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 16 Oct 2017 15:59:09 +0200 -Subject: [PATCH 3/9] block: factor out __blkdev_issue_zero_pages() +Subject: [PATCH 3/7] block: factor out __blkdev_issue_zero_pages() blkdev_issue_zeroout() will use this in !BLKDEV_ZERO_NOFALLBACK case. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch index f51cbbe27d..d713a865c3 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch @@ -1,7 +1,7 @@ -From 7f39ce12e7e718398b0e95dcce7c487825e8a36c Mon Sep 17 00:00:00 2001 +From 47e0538b031f2360cade55c566c3849c409f4bd9 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 16 Oct 2017 15:59:10 +0200 -Subject: [PATCH 4/9] block: cope with WRITE ZEROES failing in +Subject: [PATCH 4/7] block: cope with WRITE ZEROES failing in blkdev_issue_zeroout() sd_config_write_same() ignores ->max_ws_blocks == 0 and resets it to diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-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/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch index 98eec0a336..bba8466adc 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-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/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -1,7 +1,7 @@ -From 92abccceea629296ed80273c957667add8381dd7 Mon Sep 17 00:00:00 2001 +From d0d7ef751f12bb18b79f53d4ee720ad10013188f Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 21:23:12 -0500 -Subject: [PATCH 5/9] tools/objtool/Makefile: Don't fail on fallthrough with +Subject: [PATCH 5/7] 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/z0006-Revert-random-use-a-different-mixing-algorithm-for-a.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-Revert-random-use-a-different-mixing-algorithm-for-a.patch deleted file mode 100644 index c3275a48e4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-Revert-random-use-a-different-mixing-algorithm-for-a.patch +++ /dev/null @@ -1,94 +0,0 @@ -From c7739e5bc74c74d14da9037878a793234a583f8d Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Wed, 2 May 2018 15:16:29 -0400 -Subject: [PATCH 6/9] Revert "random: use a different mixing algorithm for - add_device_randomness()" - -This reverts commit 7b6b1f3a192372937164d1293b432c640ffc7c8f. ---- - drivers/char/random.c | 55 ++++----------------------------------------------- - 1 file changed, 4 insertions(+), 51 deletions(-) - -diff --git a/drivers/char/random.c b/drivers/char/random.c -index ddc493d976fd..42ed176c4bfd 100644 ---- a/drivers/char/random.c -+++ b/drivers/char/random.c -@@ -831,10 +831,6 @@ static void numa_crng_init(void) - static void numa_crng_init(void) {} - #endif - --/* -- * crng_fast_load() can be called by code in the interrupt service -- * path. So we can't afford to dilly-dally. -- */ - static int crng_fast_load(const char *cp, size_t len) - { - unsigned long flags; -@@ -861,51 +857,6 @@ static int crng_fast_load(const char *cp, size_t len) - return 1; - } - --/* -- * crng_slow_load() is called by add_device_randomness, which has two -- * attributes. (1) We can't trust the buffer passed to it is -- * guaranteed to be unpredictable (so it might not have any entropy at -- * all), and (2) it doesn't have the performance constraints of -- * crng_fast_load(). -- * -- * So we do something more comprehensive which is guaranteed to touch -- * all of the primary_crng's state, and which uses a LFSR with a -- * period of 255 as part of the mixing algorithm. Finally, we do -- * *not* advance crng_init_cnt since buffer we may get may be something -- * like a fixed DMI table (for example), which might very well be -- * unique to the machine, but is otherwise unvarying. -- */ --static int crng_slow_load(const char *cp, size_t len) --{ -- unsigned long flags; -- static unsigned char lfsr = 1; -- unsigned char tmp; -- unsigned i, max = CHACHA20_KEY_SIZE; -- const char * src_buf = cp; -- char * dest_buf = (char *) &primary_crng.state[4]; -- -- if (!spin_trylock_irqsave(&primary_crng.lock, flags)) -- return 0; -- if (crng_init != 0) { -- spin_unlock_irqrestore(&primary_crng.lock, flags); -- return 0; -- } -- if (len > max) -- max = len; -- -- for (i = 0; i < max ; i++) { -- tmp = lfsr; -- lfsr >>= 1; -- if (tmp & 1) -- lfsr ^= 0xE1; -- tmp = dest_buf[i % CHACHA20_KEY_SIZE]; -- dest_buf[i % CHACHA20_KEY_SIZE] ^= src_buf[i % len] ^ lfsr; -- lfsr += (tmp << 3) | (tmp >> 5); -- } -- spin_unlock_irqrestore(&primary_crng.lock, flags); -- return 1; --} -- - static void crng_reseed(struct crng_state *crng, struct entropy_store *r) - { - unsigned long flags; -@@ -1089,8 +1040,10 @@ void add_device_randomness(const void *buf, unsigned int size) - unsigned long time = random_get_entropy() ^ jiffies; - unsigned long flags; - -- if (!crng_ready() && size) -- crng_slow_load(buf, size); -+ if (!crng_ready()) { -+ crng_fast_load(buf, size); -+ return; -+ } - - trace_add_device_randomness(size, _RET_IP_); - spin_lock_irqsave(&input_pool.lock, flags); --- -2.14.4 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0008-xen-netfront-Fix-mismatched-rtnl_unlock.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-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/z0008-xen-netfront-Fix-mismatched-rtnl_unlock.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-xen-netfront-Fix-mismatched-rtnl_unlock.patch index 8fc7398542..8a6af3dc3b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0008-xen-netfront-Fix-mismatched-rtnl_unlock.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-xen-netfront-Fix-mismatched-rtnl_unlock.patch @@ -1,7 +1,7 @@ -From 55e0ae615e2c5187a625d5f11e6c9d62a4377fd8 Mon Sep 17 00:00:00 2001 +From 0ff5140c443d30a1936f3b3e3cdc53e4032b73df Mon Sep 17 00:00:00 2001 From: Ross Lagerwall Date: Thu, 21 Jun 2018 14:00:20 +0100 -Subject: [PATCH 8/9] xen-netfront: Fix mismatched rtnl_unlock +Subject: [PATCH 6/7] 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/z0007-Revert-random-fix-crng_ready-test.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0007-Revert-random-fix-crng_ready-test.patch deleted file mode 100644 index b8cdb3a164..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0007-Revert-random-fix-crng_ready-test.patch +++ /dev/null @@ -1,62 +0,0 @@ -From f299866019932ba12e25972a9a66dfa363027855 Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Wed, 2 May 2018 15:18:03 -0400 -Subject: [PATCH 7/9] Revert "random: fix crng_ready() test" - -This reverts commit 6e513bc20ca63f594632eca4e1968791240b8f18. ---- - drivers/char/random.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/drivers/char/random.c b/drivers/char/random.c -index 42ed176c4bfd..0bb3d0cd7d2d 100644 ---- a/drivers/char/random.c -+++ b/drivers/char/random.c -@@ -428,7 +428,7 @@ struct crng_state primary_crng = { - * its value (from 0->1->2). - */ - static int crng_init = 0; --#define crng_ready() (likely(crng_init > 1)) -+#define crng_ready() (likely(crng_init > 0)) - static int crng_init_cnt = 0; - static unsigned long crng_global_init_time = 0; - #define CRNG_INIT_CNT_THRESH (2*CHACHA20_KEY_SIZE) -@@ -838,7 +838,7 @@ static int crng_fast_load(const char *cp, size_t len) - - if (!spin_trylock_irqsave(&primary_crng.lock, flags)) - return 0; -- if (crng_init != 0) { -+ if (crng_ready()) { - spin_unlock_irqrestore(&primary_crng.lock, flags); - return 0; - } -@@ -913,7 +913,7 @@ static void _extract_crng(struct crng_state *crng, - { - unsigned long v, flags; - -- if (crng_ready() && -+ if (crng_init > 1 && - (time_after(crng_global_init_time, crng->init_time) || - time_after(jiffies, crng->init_time + CRNG_RESEED_INTERVAL))) - crng_reseed(crng, crng == &primary_crng ? &input_pool : NULL); -@@ -1200,7 +1200,7 @@ void add_interrupt_randomness(int irq, int irq_flags) - fast_mix(fast_pool); - add_interrupt_bench(cycles); - -- if (unlikely(crng_init == 0)) { -+ if (!crng_ready()) { - if ((fast_pool->count >= 64) && - crng_fast_load((char *) fast_pool->pool, - sizeof(fast_pool->pool))) { -@@ -2269,7 +2269,7 @@ void add_hwgenerator_randomness(const char *buffer, size_t count, - { - struct entropy_store *poolp = &input_pool; - -- if (unlikely(crng_init == 0)) { -+ if (!crng_ready()) { - crng_fast_load(buffer, count); - return; - } --- -2.14.4 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0009-xen-netfront-Update-features-after-registering-netde.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0007-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/z0009-xen-netfront-Update-features-after-registering-netde.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0007-xen-netfront-Update-features-after-registering-netde.patch index 6040050e40..b8e2c0492a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0009-xen-netfront-Update-features-after-registering-netde.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0007-xen-netfront-Update-features-after-registering-netde.patch @@ -1,7 +1,7 @@ -From 840e596ae0204197a64afc27b26afebf4a935426 Mon Sep 17 00:00:00 2001 +From d2079055f3130b7ca42fe2f903200942fafccbe2 Mon Sep 17 00:00:00 2001 From: Ross Lagerwall Date: Thu, 21 Jun 2018 14:00:21 +0100 -Subject: [PATCH 9/9] xen-netfront: Update features after registering netdev +Subject: [PATCH 7/7] 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