Merge pull request #3759 from coreosbot/alpha-4.19.71

Upgrade Linux in alpha to 4.19.71
coreos · Sep 7, 2019 · e9dd284 · e9dd284
2 parents 457eff5 + 0cff229
commit e9dd284
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/...d5-cache/sys-kernel/coreos-kernel-4.19.69 → ...d5-cache/sys-kernel/coreos-kernel-4.19.71 b/...d5-cache/sys-kernel/coreos-kernel-4.19.69 → ...d5-cache/sys-kernel/coreos-kernel-4.19.71
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-modules-4.19.69 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.69
+DEPEND==sys-kernel/coreos-modules-4.19.71 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.71
 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.69
+RDEPEND==sys-kernel/coreos-modules-4.19.71
 RESTRICT=binchecks strip
-SLOT=0/4.19.69
+SLOT=0/4.19.71
 _eclasses_=coreos-kernel	588460f26859c559935beb69c53cb5c0	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=1a19bf8157015b4dcd933d7281d1920d
diff --git a/...5-cache/sys-kernel/coreos-modules-4.19.69 → ...5-cache/sys-kernel/coreos-modules-4.19.71 b/...5-cache/sys-kernel/coreos-modules-4.19.69 → ...5-cache/sys-kernel/coreos-modules-4.19.71
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-sources-4.19.69
+DEPEND==sys-kernel/coreos-sources-4.19.71
 DESCRIPTION=CoreOS Linux kernel modules
 EAPI=5
 HOMEPAGE=http://www.kernel.org
@@ -8,6 +8,6 @@ KEYWORDS=amd64
 LICENSE=GPL-2 freedist
 RDEPEND=!<sys-kernel/coreos-kernel-4.6.3-r1
 RESTRICT=binchecks strip
-SLOT=0/4.19.69
+SLOT=0/4.19.71
 _eclasses_=coreos-kernel	588460f26859c559935beb69c53cb5c0	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=9bfb20f0c6dec0fbb70b49ec01ba693f
diff --git a/...5-cache/sys-kernel/coreos-sources-4.19.69 → ...5-cache/sys-kernel/coreos-sources-4.19.71 b/...5-cache/sys-kernel/coreos-sources-4.19.69 → ...5-cache/sys-kernel/coreos-sources-4.19.71
@@ -8,7 +8,7 @@ KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.19.69
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.69.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.71
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.71.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_=2cdcfc21a3fe0650309ffa033e2d0bd5
diff --git a/...oreos-kernel/coreos-kernel-4.19.69.ebuild → ...oreos-kernel/coreos-kernel-4.19.71.ebuild b/...oreos-kernel/coreos-kernel-4.19.69.ebuild → ...oreos-kernel/coreos-kernel-4.19.71.ebuild
diff --git a/...eos-modules/coreos-modules-4.19.69.ebuild → ...eos-modules/coreos-modules-4.19.71.ebuild b/...eos-modules/coreos-modules-4.19.69.ebuild → ...eos-modules/coreos-modules-4.19.71.ebuild
diff --git 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.69.xz 1716340 BLAKE2B c1a9b09184f2d8dc1f630ef04da236b8e24f88a1f9963883fae09cd44c390231af263816bb22176af5eddccfaab8ee5bc73df2020006461bd25a82a0dad92988 SHA512 4c255378c97410f854737a3fa655bdd3e77b36f7dae198770158d8e68b98774a49689e93e6593adea3d427870a79fa09c410b40d590bcd3018051a3b56aaadcd
+DIST patch-4.19.71.xz 1733204 BLAKE2B 76d07ebae44ca5c4c275df79adb913eb40080eaaf7eef603c6f6be01e7c8c739cd7811f5a865253ba14bffff69b2abe239bd6ba63bd14961901a246197cdb799 SHA512 a600bfb9f45b589ccdba0a99428f55e6c8f235df0b170f0a1d4d30c2decd5e92f423763a3b377837b46504505214e1fd0b47ff2f246b00a677779bbf299eb68e
diff --git a/...eos-sources/coreos-sources-4.19.69.ebuild → ...eos-sources/coreos-sources-4.19.71.ebuild b/...eos-sources/coreos-sources-4.19.69.ebuild → ...eos-sources/coreos-sources-4.19.71.ebuild
diff --git a/...oreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch b/...oreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch
@@ -1,4 +1,4 @@
-From 4780c2ea2e6b49810e1ca9368efa0dbf85d244b5 Mon Sep 17 00:00:00 2001
+From 28e04d1a30add44e49698007b319ea2fe976b731 Mon Sep 17 00:00:00 2001
 From: Vito Caputo <vito.caputo@coreos.com>
 Date: Wed, 25 Nov 2015 02:59:45 -0800
 Subject: [PATCH 1/4] 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 677341239449..6391ca20a111 100644
+index f6c9d5757470..8074d2fe9e0a 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

diff --git a/...oreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/...oreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch
@@ -1,4 +1,4 @@
-From 40839d11d28c12ad029a291550fb112442c2bf7d Mon Sep 17 00:00:00 2001
+From a815716a8ead8e4a03d0f6352a205d7bc418f38c Mon Sep 17 00:00:00 2001
 From: David Michael <david.michael@coreos.com>
 Date: Thu, 8 Feb 2018 21:23:12 -0500
 Subject: [PATCH 2/4] tools/objtool/Makefile: Don't fail on fallthrough with

diff --git a/...oreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch b/...oreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch
@@ -1,4 +1,4 @@
-From a9a415ad955f2480de6958b65d92e795363b8577 Mon Sep 17 00:00:00 2001
+From 8656239ea34f6adc7b375d2578decb70ef80b37d Mon Sep 17 00:00:00 2001
 From: Benjamin Gilbert <bgilbert@redhat.com>
 Date: Fri, 26 Oct 2018 17:00:56 -0700
 Subject: [PATCH 3/4] net/netfilter: add nf_conntrack_ipv4 compat module for

diff --git a/sys-kernel/coreos-sources/files/4.19/z0004-ovl-drop-test-for-upperdir-used-as-lowerdir.patch b/sys-kernel/coreos-sources/files/4.19/z0004-ovl-drop-test-for-upperdir-used-as-lowerdir.patch
@@ -1,4 +1,4 @@
-From 144147f9292fed623d1b0cfd538e8dff3f9510b5 Mon Sep 17 00:00:00 2001
+From 0b1efec315e61dd6c0ad09d40e39c512aaa1d943 Mon Sep 17 00:00:00 2001
 From: Benjamin Gilbert <bgilbert@redhat.com>
 Date: Tue, 9 Jul 2019 19:53:49 -0400
 Subject: [PATCH 4/4] ovl: drop test for upperdir used as lowerdir