From 4776f62bbdbd688e50f151b80a08018f0dd34b76 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 22 Aug 2018 13:57:52 +0000 Subject: [PATCH] sys-kernel/coreos-sources: Bump 4.17.17 to 4.17.18 --- .../{coreos-kernel-4.17.17 => coreos-kernel-4.17.18} | 6 +++--- .../{coreos-modules-4.17.17 => coreos-modules-4.17.18} | 4 ++-- .../{coreos-sources-4.17.17 => coreos-sources-4.17.18} | 4 ++-- ...kernel-4.17.17.ebuild => coreos-kernel-4.17.18.ebuild} | 0 ...dules-4.17.17.ebuild => coreos-modules-4.17.18.ebuild} | 0 .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 8 ++++---- ...urces-4.17.17.ebuild => coreos-sources-4.17.18.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 | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-kernel-4.17.17 => coreos-kernel-4.17.18} (83%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-modules-4.17.17 => coreos-modules-4.17.18} (92%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-sources-4.17.17 => coreos-sources-4.17.18} (93%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.17.17.ebuild => coreos-kernel-4.17.18.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.17.17.ebuild => coreos-modules-4.17.18.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.17.17.ebuild => coreos-sources-4.17.18.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.17.17 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.17.18 similarity index 83% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.17.17 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.17.18 index 1895bbf5f6..b573fed8f2 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.17.17 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.17.18 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.17.17 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.17.17 +DEPEND==sys-kernel/coreos-modules-4.17.18 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.17.18 DESCRIPTION=CoreOS Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist -RDEPEND==sys-kernel/coreos-modules-4.17.17 +RDEPEND==sys-kernel/coreos-modules-4.17.18 RESTRICT=binchecks strip -SLOT=0/4.17.17 +SLOT=0/4.17.18 _eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72 _md5_=b06e416b987a33bf039f3788ebb4a943 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.17.17 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.17.18 similarity index 92% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.17.17 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.17.18 index 9fee779e95..674a044503 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.17.17 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.17.18 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack -DEPEND==sys-kernel/coreos-sources-4.17.17 +DEPEND==sys-kernel/coreos-sources-4.17.18 DESCRIPTION=CoreOS Linux kernel modules EAPI=5 HOMEPAGE=http://www.kernel.org @@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist RDEPEND=!=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf ) RESTRICT=binchecks strip -SLOT=4.17.17 -SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.17.17.xz mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz +SLOT=4.17.18 +SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.17.18.xz mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz _eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 _md5_=70507f6887adf947a1f644259e50f51b diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.17.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.18.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.17.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.18.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.17.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.18.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.17.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.18.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 27362092e0..6e66329da3 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 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 -DIST linux-4.17.tar.xz 102165892 BLAKE2B b9e1fe2c063d2761b4d54594b841f6591fd6f5b634a402c07e0fa5518a2b271293d97c5a7a8e3c30c9c4d78df16bf20a4f0befe998c9a9393bb3290d2df1dda3 SHA512 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db -DIST patch-4.14.65.xz 1606612 BLAKE2B 8812e8d5b920156db0642210af752b5ca50cf8502ccbd8acb25bfe2a347680470aca4ae11fc887727afc0a7fc35f987dc391dcca88e75d44c6fe17938ca6129d SHA512 7e3dc52a391f325c2798a9e9f5f02a0cfb5e04a84a9190f0dfd4720e738abb780c60ced5da68bd3c2be87c4cb6f52c93a0bf2b7904a81e067787e6661df76a7d -DIST patch-4.17.17.xz 378328 BLAKE2B 7b401bde478d67931fc247b1bacb7f1d488a730caa5aea5901844b1f86dfd8f298ec170cea04010e6261d7ffefd71f7b7f7d4cabade331996050f0cbf06b702a SHA512 29cd38c11b235cd7fc4eb5c519034916fa6afce7bcf6193382b4d501b2df67afa790eca972bc5f0403e626ef4be5b0dba4a60affa4450de687af3778ae4c135a +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.65.xz 1606612 SHA256 e74f7771bf9476630031f05ff109b6bfaf84c6e4a9a883b94cea4f9b34bd4ce1 SHA512 7e3dc52a391f325c2798a9e9f5f02a0cfb5e04a84a9190f0dfd4720e738abb780c60ced5da68bd3c2be87c4cb6f52c93a0bf2b7904a81e067787e6661df76a7d WHIRLPOOL 619b9abf6f6b29627b51004a2676abd402b1641e87cd9262aedc4cc626520423c68fa60653069d9c956127d58f6374664302f816bab8d8274fdc21704fac987b +DIST patch-4.17.18.xz 388184 SHA256 89d87b1d1a5494d8326bcf03ac07f51a4eea6a244695f60f3d38f8cb9249d16f SHA512 d3f73cca96d5bd7a2b85d070248771e8ee7de911ca34e7698325c71d28c01207cd6266879e2cddb2e924f706cd7c8f294e3a9724e7095fbbc359d17828507253 WHIRLPOOL b8a94f65388a6ecace79354386d0e0528a96ba266947ec6f58c02d8cefdf7cba1d8cda6d7da0f044af3705a6dd5adcaaae8e5f7bf7c43488a5ab530831286e59 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.17.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.18.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.17.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.18.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 d9acd03463..df34476f2c 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 ab98e54ae3cb62cf9e859f93f91546c3bfb6d5b5 Mon Sep 17 00:00:00 2001 +From be536215aca0f36c6d25881a148c2edc3ce61d7b 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 5ff2040cf3ee..8e67fc1b8576 100644 +index 429a1fe0b40b..888189562233 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 1f31840976..bf89321408 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 b700bdfb0c4fd96eee344da2a2a2272a0e4b819f Mon Sep 17 00:00:00 2001 +From 5914e46df50d9ffd62e7e88138bf86257d4e7420 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 4aaba88ff8..0a46143540 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 21fa65ee7bdf44df0884b7c743c4e658a873afcd Mon Sep 17 00:00:00 2001 +From e7d823411bafd56354ed0747eebca66d4a8ae81e 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 0cf3aefa74..54a1b174d9 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 d38247e796c0b9103a54f01b6f9a7de682ba2e30 Mon Sep 17 00:00:00 2001 +From d328a0f2d9ee5b710e489cee3fe26cd30ba811c8 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 259c73846a..8293a752c6 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 04e3f1aae559ed8620f06f8e2be58a44e87cf6a9 Mon Sep 17 00:00:00 2001 +From a13fc6b88f681d70205cb13ba932df72b205bcb0 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"