From 708a1ebdf12234f0fffd7a2bc626e9ce7a723373 Mon Sep 17 00:00:00 2001 From: Jenkins OS Date: Mon, 7 Oct 2019 22:35:47 +0000 Subject: [PATCH 1/2] chore(metadata): Regenerate cache --- ..._p20190512 => intel-microcode-20190918_p20190918} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/{intel-microcode-20190618_p20190512 => intel-microcode-20190918_p20190918} (58%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190512 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/intel-microcode-20190918_p20190918 similarity index 58% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190512 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/intel-microcode-20190918_p20190918 index 82fa5a304a..ce3d70c7c8 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190512 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/intel-microcode-20190918_p20190918 @@ -1,7 +1,7 @@ +BDEPEND=sys-apps/iucode_tool DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup -DEPEND=sys-apps/iucode_tool DESCRIPTION=Intel IA32/IA64 microcode update data -EAPI=6 +EAPI=7 HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/ IUSE=hostonly initramfs +split-ucode vanilla kernel_linux KEYWORDS=-* amd64 x86 @@ -9,7 +9,7 @@ LICENSE=intel-ucode RDEPEND=hostonly? ( sys-apps/iucode_tool ) REQUIRED_USE=|| ( initramfs split-ucode ) RESTRICT=binchecks strip -SLOT=0/20190618_p20190512 -SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20190618.tar.gz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20190512.tar.xz -_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 mount-boot 1e82d96b7a7dcb483b412497a90bb646 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 -_md5_=67f5050c5e120f946f42e5e30d54a48b +SLOT=0/20190918_p20190918 +SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20190918.tar.gz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20190918.tar.xz +_eclasses_=linux-info 953c3b1c472dcadbf62098a9301327f2 mount-boot 1e82d96b7a7dcb483b412497a90bb646 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 +_md5_=b154f8a0f050ce084c5d821ea76915a5 From 3024086f2248a1467ba540b68558da5d80020be0 Mon Sep 17 00:00:00 2001 From: Jenkins OS Date: Mon, 7 Oct 2019 22:35:56 +0000 Subject: [PATCH 2/2] sys-kernel/coreos-sources: Bump 4.19.75 to 4.19.78 --- .../{coreos-kernel-4.19.75 => coreos-kernel-4.19.78} | 6 +++--- .../{coreos-modules-4.19.75 => coreos-modules-4.19.78} | 4 ++-- .../{coreos-sources-4.19.75 => coreos-sources-4.19.78} | 4 ++-- ...s-kernel-4.19.75.ebuild => coreos-kernel-4.19.78.ebuild} | 0 ...modules-4.19.75.ebuild => coreos-modules-4.19.78.ebuild} | 0 .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 2 +- ...sources-4.19.75.ebuild => coreos-sources-4.19.78.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 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-kernel-4.19.75 => coreos-kernel-4.19.78} (85%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-modules-4.19.75 => coreos-modules-4.19.78} (92%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-sources-4.19.75 => coreos-sources-4.19.78} (93%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.19.75.ebuild => coreos-kernel-4.19.78.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.19.75.ebuild => coreos-modules-4.19.78.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.19.75.ebuild => coreos-sources-4.19.78.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.75 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.78 similarity index 85% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.75 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.78 index da164f08c4..216b54f192 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.75 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.78 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.19.75 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.75 +DEPEND==sys-kernel/coreos-modules-4.19.78 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.78 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.75 +RDEPEND==sys-kernel/coreos-modules-4.19.78 RESTRICT=binchecks strip -SLOT=0/4.19.75 +SLOT=0/4.19.78 _eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 _md5_=1a19bf8157015b4dcd933d7281d1920d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.75 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.78 similarity index 92% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.75 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.78 index 9cc44d953a..200621d3aa 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.75 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.78 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack -DEPEND==sys-kernel/coreos-sources-4.19.75 +DEPEND==sys-kernel/coreos-sources-4.19.78 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.75 -SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.75.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz +SLOT=4.19.78 +SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.78.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/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.75.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.78.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.75.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.78.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.75.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.78.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.75.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.78.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 5d704e487e..e4e4ae1d9e 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.75.xz 1812812 BLAKE2B 2f665255e46b3bdc44aedcaa74b7e205782c4c702028f4cb88e22d6708b9c8e24ec68d80430962071aab38d40a95fcc66f768292e006e8d065d0c6fb7645d3c4 SHA512 e4a288355fdcb5f4e33d09f0c158305caac0326fccab603b24f7ef42fa1a369f9ac7e17a4bfad85cace5c67848eb5dca40a8849e1fcf5c5f867a59f9e9357c75 +DIST patch-4.19.78.xz 1893264 BLAKE2B b47f22ebe38209087e1aa082531837ba59528ea15bfa397fb791903b78e0fa7bd154b531d8df69a28b30246106773dbec0dd3d547d4c437e675e424540723427 SHA512 8a91021529188175f45edbb4a079f02bfbc16ced15b94ad551ea46e1b517ef3722d053e3f23a17914033605cafc6dff2d19241c4a37af8056dd69f5510a88e1f diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.75.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.78.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.75.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.78.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 a7f1707a58..adc6da5dc2 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 8b9f7e5551aaad4ef5c5c813bab33570819625f9 Mon Sep 17 00:00:00 2001 +From a5a36051a5c01fc996a996a21cd86c43683e03ec 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 4bf6f24916bf..6322f12fb3f9 100644 +index 440c5b5c4f4b..b5ab968b1b3f 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 646b5a87b2..8dcc7c8127 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 e992d15e09d91ea7a5118b22bbab501f27bfbf3f Mon Sep 17 00:00:00 2001 +From cd5fe8771e6c2c115a0d49060568e142af8e2191 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 1d4014237e..09ea662088 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 b8395f0ab67338c962e8580de07b0826024402f3 Mon Sep 17 00:00:00 2001 +From a7db29a7a3240715beeac374cf16ea467c7e5b79 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