Skip to content
This repository has been archived by the owner on Sep 18, 2020. It is now read-only.

Upgrade Linux in beta to 4.19.94 #3847

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare pretend setup unpack
DEPEND==sys-kernel/coreos-modules-4.19.91 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.91
DEPEND==sys-kernel/coreos-modules-4.19.94 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.94
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.91
RDEPEND==sys-kernel/coreos-modules-4.19.94
RESTRICT=binchecks strip
SLOT=0/4.19.91
SLOT=0/4.19.94
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
_md5_=1a19bf8157015b4dcd933d7281d1920d
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
DEPEND==sys-kernel/coreos-sources-4.19.91
DEPEND==sys-kernel/coreos-sources-4.19.94
DESCRIPTION=CoreOS Linux kernel modules
EAPI=5
HOMEPAGE=http://www.kernel.org
Expand All @@ -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.91
SLOT=0/4.19.94
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
_md5_=9bfb20f0c6dec0fbb70b49ec01ba693f
Original file line number Diff line number Diff line change
Expand Up @@ -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.91
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.91.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
SLOT=4.19.94
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.94.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
2 changes: 1 addition & 1 deletion sys-kernel/coreos-sources/Manifest
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
DIST patch-4.19.91.xz 2429724 BLAKE2B b885ec9f01256ea04c8584119305c64dd8b00de1abd21912c153c95c74efb3c0cb90a8e965c8d657daddfdc9983d2d79fca9465e0591e70a71f9019ac7906037 SHA512 f0503aceac6a592faae1cb97fcef107d8a73e1dba9ba712f11999c07fefc9ab84357a109ac26d61e8576539e7e8baf38199be6bc3f3eca3797136dafd22b03af
DIST patch-4.19.94.xz 2516876 BLAKE2B 6d7e4a676bf3d8438248f3a576a4a92ef996c0027b4225f6752398a7de289bc54cbf383407554a58c1cb22fec2a1b073a78a4cc074d824217f5b364621e756d4 SHA512 db31cbc7e7e62f65998c8f4444f9705213c0f60c623f84d5a2dc6c51c69f331354380a54a20b24da4cd3711ce4ad07d77c5b791067e47a300e655cf68e65a34a
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d218de0becdfcab0c67a3bd99ea2e1e27fc75bc3 Mon Sep 17 00:00:00 2001
From 726ea9cda0e7c50d75a5429b38b880be9dc955b8 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/3] kbuild: derive relative path for KBUILD_SRC from CURDIR
Expand All @@ -12,7 +12,7 @@ by some undesirable path component.
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4e07d786bec2..210ea131dea6 100644
index 3c892a77194f..b6451d6bb9dc 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6909d73132a0b1b5fcacf525fc134089a3058b07 Mon Sep 17 00:00:00 2001
From 8724c412ca58fad88394a5551ec7eac2fda127e5 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/3] tools/objtool/Makefile: Don't fail on fallthrough with
Expand All @@ -9,10 +9,10 @@ Subject: [PATCH 2/3] tools/objtool/Makefile: Don't fail on fallthrough with
1 file changed, 3 insertions(+)

diff --git a/tools/lib/subcmd/Makefile b/tools/lib/subcmd/Makefile
index 5b2cd5e58df0..cb255e5ad545 100644
index 5dbb0dde208c..9c7c6a2fd809 100644
--- a/tools/lib/subcmd/Makefile
+++ b/tools/lib/subcmd/Makefile
@@ -39,6 +39,9 @@ ifneq ($(WERROR),0)
@@ -41,6 +41,9 @@ ifneq ($(WERROR),0)
CFLAGS += -Werror
endif

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4bee912f75277e17223b5758a6ac03412fa96bd8 Mon Sep 17 00:00:00 2001
From c2a0533af598072133c4e48a1db086981b8518fd 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/3] net/netfilter: add nf_conntrack_ipv4 compat module for
Expand Down