From ef661d229e92adcec07342afc47c18f9680b9010 Mon Sep 17 00:00:00 2001 From: David Michael Date: Sun, 10 Mar 2019 15:07:10 +0000 Subject: [PATCH 1/2] chore(metadata): Regenerate cache --- .../md5-cache/coreos-devel/{mantle-0.11.1 => mantle-0.12.0} | 2 +- .../coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/{mantle-0.11.1 => mantle-0.12.0} (95%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.11.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.12.0 similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.11.1 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.12.0 index 02a2170ed3..0195db6743 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.11.1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.12.0 @@ -10,4 +10,4 @@ RDEPEND=>=net-dns/dnsmasq-2.72[dhcp,ipv6] REQUIRED_USE=go_version_go1_12 SLOT=0 _eclasses_=coreos-go 4b5ca59bf74e156a63ce4e6e0d806144 coreos-go-depend 688230059f31df4bd9277464f10a6fa5 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs f164325a2cdb5b3ea39311d483988861 -_md5_=20cc0d37ce0e35fdeda6abf647df9c24 +_md5_=6d5704c73f8009cf106c5643102668fd diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999 index 00e9da18a0..06dbec8a44 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999 @@ -10,4 +10,4 @@ RDEPEND=>=net-dns/dnsmasq-2.72[dhcp,ipv6] REQUIRED_USE=go_version_go1_12 SLOT=0 _eclasses_=coreos-go 4b5ca59bf74e156a63ce4e6e0d806144 coreos-go-depend 688230059f31df4bd9277464f10a6fa5 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs f164325a2cdb5b3ea39311d483988861 -_md5_=20cc0d37ce0e35fdeda6abf647df9c24 +_md5_=6d5704c73f8009cf106c5643102668fd From 40125f2787e03ac4098439e420779517b9fba650 Mon Sep 17 00:00:00 2001 From: David Michael Date: Sun, 10 Mar 2019 15:08:35 +0000 Subject: [PATCH 2/2] sys-kernel/coreos-sources: Bump 4.19.27 to 4.19.28 --- .../md5-cache/sys-kernel/coreos-kernel-4.19.27-r1 | 13 ------------- .../md5-cache/sys-kernel/coreos-kernel-4.19.28 | 13 +++++++++++++ ...os-modules-4.19.27-r1 => coreos-modules-4.19.28} | 4 ++-- ...oreos-sources-4.19.27 => coreos-sources-4.19.28} | 4 ++-- ...19.27-r1.ebuild => coreos-kernel-4.19.28.ebuild} | 0 ...9.27-r1.ebuild => coreos-modules-4.19.28.ebuild} | 0 .../sys-kernel/coreos-sources/Manifest | 2 +- ...4.19.27.ebuild => coreos-sources-4.19.28.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, 22 insertions(+), 22 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.27-r1 create mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.28 rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-modules-4.19.27-r1 => coreos-modules-4.19.28} (91%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-sources-4.19.27 => coreos-sources-4.19.28} (93%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.19.27-r1.ebuild => coreos-kernel-4.19.28.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.19.27-r1.ebuild => coreos-modules-4.19.28.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.19.27.ebuild => coreos-sources-4.19.28.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.27-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.27-r1 deleted file mode 100644 index 1c3f899739..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.27-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.19.27-r1 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.27 -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.27-r1 -RESTRICT=binchecks strip -SLOT=0/4.19.27-r1 -_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861 -_md5_=1a19bf8157015b4dcd933d7281d1920d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.28 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.28 new file mode 100644 index 0000000000..1714ae01d8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.28 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare pretend setup unpack +DEPEND==sys-kernel/coreos-modules-4.19.28 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.28 +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.28 +RESTRICT=binchecks strip +SLOT=0/4.19.28 +_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861 +_md5_=1a19bf8157015b4dcd933d7281d1920d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.27-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.28 similarity index 91% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.27-r1 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.28 index 9577074ae2..8e3160189d 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.27-r1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.28 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack -DEPEND==sys-kernel/coreos-sources-4.19.27 +DEPEND==sys-kernel/coreos-sources-4.19.28 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.27 -SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.27.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz +SLOT=4.19.28 +SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.28.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 97f96577827180eddaa76c6bce3470ee 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.27-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.28.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.27-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.28.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.27-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.28.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.27-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.28.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 4ddd124471..138ebee97f 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,2 +1,2 @@ DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 -DIST patch-4.19.27.xz 776244 BLAKE2B df2d0d145b63e184bfc4cfe4c62a554206ca74d8d2b5b7f5451ffd87856a39fae1b2ec6d893eef2cf231f0fc6f0d4f72541ae4d25d8b7807ddb7d1197ce48b8f SHA512 bea4ce8bdab43668fa82a1ddb513cbda8cdc4be85e1e73964190e9ed9937139545ea75c03ec7c747d9b20ae463cf04973ea6057b310e03983ec926856d4946e1 +DIST patch-4.19.28.xz 792280 BLAKE2B 1abb83c11972d1ed141bf2a4eb733a30e4899147f5519e530e457b924016f4a67204ae50db8cc606b96d812928d66b6549b353d32295944b08f5ffc5708e51d1 SHA512 8c8a94b0922ac52bc20dc29d900cdd358f9019d57d0510e16d0cc9348dd5df97fe68f2aa59a70beae6e8d21a82f0024cc0c509d828c4be5b6adad9dc8b14cafa diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.27.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.28.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.27.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.28.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 2cf6fb9020..fcc0cf0198 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 9b40fb2d5190796007c80945aa96bfa9b3280a49 Mon Sep 17 00:00:00 2001 +From 8d6217ff0796aacb9e0eea0ea3c3c35a40e86cb3 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 70ed9a53558a..9befad0d9184 100644 +index c6ac023ba33a..2640ab9e812e 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 5f1a62c6c6..af1bdbb17d 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 79333ab47b87223f36d3ffb5fda4a030d5e55f93 Mon Sep 17 00:00:00 2001 +From 8d4d9e7f722d24adfdd24a9763840cb99f04f60b 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 72d49f5b9b..7c212fe572 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 a4a70f577bfe90a78cb2d14b1d6efe3c7e2c96e1 Mon Sep 17 00:00:00 2001 +From f3b4aa346e4c33c2df8b85efcb26cfe9d14d9a72 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