From 2cc3e1bfd0ae65067417add6fc6458f1142bf60a Mon Sep 17 00:00:00 2001 From: Jenkins OS Date: Thu, 16 Apr 2020 06:27:08 +0000 Subject: [PATCH] sys-kernel/coreos-sources: Bump 4.19.114 to 4.19.115 --- .../{coreos-kernel-4.19.114 => coreos-kernel-4.19.115} | 6 +++--- .../{coreos-modules-4.19.114 => coreos-modules-4.19.115} | 4 ++-- .../{coreos-sources-4.19.114 => coreos-sources-4.19.115} | 4 ++-- ...kernel-4.19.114.ebuild => coreos-kernel-4.19.115.ebuild} | 0 ...dules-4.19.114.ebuild => coreos-modules-4.19.115.ebuild} | 0 sys-kernel/coreos-sources/Manifest | 2 +- ...urces-4.19.114.ebuild => coreos-sources-4.19.115.ebuild} | 0 ...uild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch | 4 ++-- ...ols-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch | 2 +- ...t-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename metadata/md5-cache/sys-kernel/{coreos-kernel-4.19.114 => coreos-kernel-4.19.115} (85%) rename metadata/md5-cache/sys-kernel/{coreos-modules-4.19.114 => coreos-modules-4.19.115} (91%) rename metadata/md5-cache/sys-kernel/{coreos-sources-4.19.114 => coreos-sources-4.19.115} (93%) rename sys-kernel/coreos-kernel/{coreos-kernel-4.19.114.ebuild => coreos-kernel-4.19.115.ebuild} (100%) rename sys-kernel/coreos-modules/{coreos-modules-4.19.114.ebuild => coreos-modules-4.19.115.ebuild} (100%) rename sys-kernel/coreos-sources/{coreos-sources-4.19.114.ebuild => coreos-sources-4.19.115.ebuild} (100%) diff --git a/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.114 b/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.115 similarity index 85% rename from metadata/md5-cache/sys-kernel/coreos-kernel-4.19.114 rename to metadata/md5-cache/sys-kernel/coreos-kernel-4.19.115 index 0179f8ea2c..48667cbb9f 100644 --- a/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.114 +++ b/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.115 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.19.114 app-arch/gzip app-shells/bash coreos-base/coreos-init:= 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.114 +DEPEND==sys-kernel/coreos-modules-4.19.115 app-arch/gzip app-shells/bash coreos-base/coreos-init:= 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.115 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.114 +RDEPEND==sys-kernel/coreos-modules-4.19.115 RESTRICT=binchecks strip -SLOT=0/4.19.114 +SLOT=0/4.19.115 _eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 _md5_=1a19bf8157015b4dcd933d7281d1920d diff --git a/metadata/md5-cache/sys-kernel/coreos-modules-4.19.114 b/metadata/md5-cache/sys-kernel/coreos-modules-4.19.115 similarity index 91% rename from metadata/md5-cache/sys-kernel/coreos-modules-4.19.114 rename to metadata/md5-cache/sys-kernel/coreos-modules-4.19.115 index d113d53f6e..c4b28cd218 100644 --- a/metadata/md5-cache/sys-kernel/coreos-modules-4.19.114 +++ b/metadata/md5-cache/sys-kernel/coreos-modules-4.19.115 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack -DEPEND==sys-kernel/coreos-sources-4.19.114 +DEPEND==sys-kernel/coreos-sources-4.19.115 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.114 -SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.114.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz +SLOT=4.19.115 +SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.115.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 b2fdd65b5edb72d87dedaa82df19553c ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf _md5_=d79cabc85557a16224cb73e5803fb741 diff --git a/sys-kernel/coreos-kernel/coreos-kernel-4.19.114.ebuild b/sys-kernel/coreos-kernel/coreos-kernel-4.19.115.ebuild similarity index 100% rename from sys-kernel/coreos-kernel/coreos-kernel-4.19.114.ebuild rename to sys-kernel/coreos-kernel/coreos-kernel-4.19.115.ebuild diff --git a/sys-kernel/coreos-modules/coreos-modules-4.19.114.ebuild b/sys-kernel/coreos-modules/coreos-modules-4.19.115.ebuild similarity index 100% rename from sys-kernel/coreos-modules/coreos-modules-4.19.114.ebuild rename to sys-kernel/coreos-modules/coreos-modules-4.19.115.ebuild diff --git a/sys-kernel/coreos-sources/Manifest b/sys-kernel/coreos-sources/Manifest index 2eb096ae5b..2387fc7dbf 100644 --- a/sys-kernel/coreos-sources/Manifest +++ b/sys-kernel/coreos-sources/Manifest @@ -1,2 +1,2 @@ DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 -DIST patch-4.19.114.xz 2942712 BLAKE2B a21b1e2bcc241d989bb54f8d417db3b168b3ec5676048bc9f98fca87fbfe67d97c5005a4bbd97eba7c6ec85da4160b1e9c21cd5ff3f39341a67f08de9113bfee SHA512 9e42cf4a20ae74d7bb6d52c9785a24fe334c97328116e1adae8bbed45922064f953b3e925b60d3c754f019f1195e4bc2e8326d222e13bc3057a02b103356b0b1 +DIST patch-4.19.115.xz 2953424 BLAKE2B 5491ff5540b86fe3fe86bb5a26890ec06d69a194c4289c42a1d4ec439189ebed849dfaef17a723518e67cb1fc8be3a4129feac4b693cde4c43a81bbd407169d1 SHA512 fa04d26484ee85a8fbeb16297f07f8150aa207c6ae2b3de58e44b709dbf9bb986ee4d172baeb90eb87522aae9e7d4f5be92535ed6199326bdfad93ab8ef9e81e diff --git a/sys-kernel/coreos-sources/coreos-sources-4.19.114.ebuild b/sys-kernel/coreos-sources/coreos-sources-4.19.115.ebuild similarity index 100% rename from sys-kernel/coreos-sources/coreos-sources-4.19.114.ebuild rename to sys-kernel/coreos-sources/coreos-sources-4.19.115.ebuild diff --git a/sys-kernel/coreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch b/sys-kernel/coreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch index 4e923a5a52..5b4d059162 100644 --- a/sys-kernel/coreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch +++ b/sys-kernel/coreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch @@ -1,4 +1,4 @@ -From 7630bcdc66f7a05c08c16178337e9a2058c7f8b6 Mon Sep 17 00:00:00 2001 +From 0069b171f049f012372431e39dd5bb56ecdee6b0 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 6f849dafbfec..7887fa706fc6 100644 +index 9830a71e9192..1ac822c9a807 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make diff --git a/sys-kernel/coreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/sys-kernel/coreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch index 3eb6dfd398..0a8b23f7d2 100644 --- a/sys-kernel/coreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch +++ b/sys-kernel/coreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -1,4 +1,4 @@ -From 8503927e69b934a4790f78b8344eb1d9aa3b258f Mon Sep 17 00:00:00 2001 +From 9e4cfa47ed241858dfae2f18a63301ee3757f37d 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/sys-kernel/coreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch b/sys-kernel/coreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch index 52cf989530..3cad17fd59 100644 --- a/sys-kernel/coreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch +++ b/sys-kernel/coreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch @@ -1,4 +1,4 @@ -From 36a6b1eeb08285ce8f7bdd355f79adf2a72926c2 Mon Sep 17 00:00:00 2001 +From 78cb157c0ade5d10730a1cd358ce04505974a633 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