From d28557768c94e00c6583f9fc6219b09999d0ce02 Mon Sep 17 00:00:00 2001 From: David Michael Date: Sun, 4 Nov 2018 23:28:39 +0000 Subject: [PATCH] sys-kernel/coreos-sources: Bump 4.19 to 4.19.1 --- .../md5-cache/sys-kernel/coreos-kernel-4.19.0-r1 | 13 ------------- .../md5-cache/sys-kernel/coreos-kernel-4.19.1 | 13 +++++++++++++ ...reos-modules-4.19.0-r1 => coreos-modules-4.19.1} | 6 +++--- ...reos-sources-4.19.0-r1 => coreos-sources-4.19.1} | 4 ++-- ...4.19.0-r1.ebuild => coreos-kernel-4.19.1.ebuild} | 2 +- ....19.0-r1.ebuild => coreos-modules-4.19.1.ebuild} | 2 +- .../sys-kernel/coreos-sources/Manifest | 1 + ....19.0-r1.ebuild => coreos-sources-4.19.1.ebuild} | 0 ...ive-relative-path-for-KBUILD_SRC-from-CURD.patch | 4 ++-- ...ool-Makefile-Don-t-fail-on-fallthrough-wit.patch | 2 +- ...ter-add-nf_conntrack_ipv4-compat-module-fo.patch | 2 +- 11 files changed, 25 insertions(+), 24 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.0-r1 create mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.1 rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-modules-4.19.0-r1 => coreos-modules-4.19.1} (86%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-sources-4.19.0-r1 => coreos-sources-4.19.1} (90%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.19.0-r1.ebuild => coreos-kernel-4.19.1.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.19.0-r1.ebuild => coreos-modules-4.19.1.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.19.0-r1.ebuild => coreos-sources-4.19.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.0-r1 deleted file mode 100644 index a3a8a57daa..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.0-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.19.0-r1 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/nvme-cli 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.19.0-r1 -DESCRIPTION=CoreOS Linux kernel -EAPI=5 -HOMEPAGE=http://www.kernel.org -IUSE=kernel_linux -KEYWORDS=amd64 -LICENSE=GPL-2 freedist -RDEPEND==sys-kernel/coreos-modules-4.19.0-r1 -RESTRICT=binchecks strip -SLOT=0/4.19.0-r1 -_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861 -_md5_=322faa2ab9133a163e6b48742b42f1d3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.1 new file mode 100644 index 0000000000..fdef10e125 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare pretend setup unpack +DEPEND==sys-kernel/coreos-modules-4.19.1 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/nvme-cli 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.19.1 +DESCRIPTION=CoreOS Linux kernel +EAPI=5 +HOMEPAGE=http://www.kernel.org +IUSE=kernel_linux +KEYWORDS=amd64 +LICENSE=GPL-2 freedist +RDEPEND==sys-kernel/coreos-modules-4.19.1 +RESTRICT=binchecks strip +SLOT=0/4.19.1 +_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861 +_md5_=42753b8cebb468da769ebfda0bcf0620 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.1 similarity index 86% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.0-r1 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.1 index be057fcf83..0e29bca2a4 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.0-r1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.1 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack -DEPEND==sys-kernel/coreos-sources-4.19.0-r1 +DEPEND==sys-kernel/coreos-sources-4.19.1 DESCRIPTION=CoreOS Linux kernel modules EAPI=5 HOMEPAGE=http://www.kernel.org @@ -8,6 +8,6 @@ KEYWORDS=amd64 LICENSE=GPL-2 freedist RDEPEND=!=sys-libs/ncurses-5.2 virtual/libelf ) RESTRICT=binchecks strip -SLOT=4.19.0-r1 -SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz +SLOT=4.19.1 +SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.1.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 kernel-2 bc2f2b5caeb6f89c673a8a4dced6511e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf _md5_=54be679df5ad779d11123c95cb8c0ed8 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.1.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.1.ebuild index 4342e0c822..48c59fc36e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.0-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.1.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.19.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.1.ebuild index 2ec41a9dc5..bba80e7e2d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.0-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.1.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 11cf6dfb79..b1dfe20c0f 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,3 +1,4 @@ DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 DIST patch-4.14.78.xz 1888728 BLAKE2B 37d2cf9594422748e493b7d7b000917a45fb5d231b088945f8a458d522b7c42754beb2bed138b562c823d5aaa31c2c9dcda276a9460e57fb857899037c4777d8 SHA512 bf0c0cbe9ee7ddfee0d8a70656e6db5979d1928c7aad917039c471ad6e2b049fe9d0f59161dab5ccfb9180263d2630cd6df735524b5886f0d05f709cb30b11bd +DIST patch-4.19.1.xz 9664 BLAKE2B 936fc38071acf9f3f9cdd542d7cb9dddefcf8ca40d8186fd1d3af7de9c542eb25fa55633a2d7c689d39b0f45ddf1ec46e86ca1c8f8db7423b0fe446cd44684fe SHA512 10e1f3c1ffbcd14a16005e06a3c7f025c37061e4d2eddca31639f70d813c9d98c3a032c328dde2f41799064656e6430a76e8a297fe42173d572e3080ba2026aa diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/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.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch index bc86697ed8..eddfcd49e9 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/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.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch @@ -1,4 +1,4 @@ -From 032844ef57f314206644fc41cc215216c29ec336 Mon Sep 17 00:00:00 2001 +From 4f5f4f7bd6cd58fa8c9fe3ea45c2e391dc78ca2b Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 Subject: [PATCH 1/3] 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 69fa5c0310d8..c81b2a21eff1 100644 +index abcd8ca4966f..c2841383032a 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.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch index 3879309b34..2090ad61e9 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -1,4 +1,4 @@ -From 175b5d6d56990d94e5f2e848923b1e358be3cd39 Mon Sep 17 00:00:00 2001 +From 79dbf51f52584fa99bc73f4dd61a2de87e6256a7 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 21:23:12 -0500 Subject: [PATCH 2/3] 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.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch index 20bf56b36a..955ac492ff 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch @@ -1,4 +1,4 @@ -From 8fdc104582cf65fc4665a799a7de03f157907066 Mon Sep 17 00:00:00 2001 +From 5f51254c740fb2eeb4479cdd260ab894e0ce38c6 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 26 Oct 2018 17:00:56 -0700 Subject: [PATCH 3/3] net/netfilter: add nf_conntrack_ipv4 compat module for