Merge pull request #3588 from dm0-/linux

Bump Linux 4.19.24 to 4.19.25
This commit is contained in:
David Michael 2019-02-23 13:04:18 -05:00 committed by GitHub
commit 226dc05f0d
10 changed files with 12 additions and 12 deletions

View File

@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare pretend setup unpack
DEPEND==sys-kernel/coreos-modules-4.19.24 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.24
DEPEND==sys-kernel/coreos-modules-4.19.25 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.25
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.24
RDEPEND==sys-kernel/coreos-modules-4.19.25
RESTRICT=binchecks strip
SLOT=0/4.19.24
SLOT=0/4.19.25
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861
_md5_=1a19bf8157015b4dcd933d7281d1920d

View File

@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
DEPEND==sys-kernel/coreos-sources-4.19.24
DEPEND==sys-kernel/coreos-sources-4.19.25
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.24
SLOT=0/4.19.25
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs f164325a2cdb5b3ea39311d483988861
_md5_=9bfb20f0c6dec0fbb70b49ec01ba693f

View File

@ -8,7 +8,7 @@ KEYWORDS=amd64
LICENSE=GPL-2 linux-firmware
RDEPEND=sys-devel/bison sys-devel/flex !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.24
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.24.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
SLOT=4.19.25
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.25.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

View File

@ -1,2 +1,2 @@
DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
DIST patch-4.19.24.xz 708128 BLAKE2B 3324b9831c7ac2b07f7a6a0633e7dc525249a5022aa96e1ad13f42c45bbec82320dc068f2e7280c0fdc529b4e1b7bef778a7cc5707ffd5c7ffebc6443805b7f8 SHA512 b4040344a6c00ee917a4afa8e1fcb93c0a8345cf0923a35767a2dd5644570c81101adfeae80dedd9cc52c3c27d6bef25e4a44f92c1a9201941c173f54f450b95
DIST patch-4.19.25.xz 713512 BLAKE2B f33a0f85b22b8e5023343b264c2516d7b2a27397defd70df8ea4549de603daa4d0a907bbf0c820c9b0a8deae8fd3de2526f2d7fb86380f688d83afc329a6af30 SHA512 fc2a3eaf9cc3b1005c49426680e9d92a5ef65632348350d921f5f1e25db0de3f95b29690f6971bab8956c49f6f70ad581c8514e2262b06cca2fd9b56e012d677

View File

@ -1,4 +1,4 @@
From 6b8cfa92222a7a12a1cbfa0b02b4371bf2d6b7ee Mon Sep 17 00:00:00 2001
From e998b63b0afdabcb76447ae9374736aa72c490a7 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
@ -12,7 +12,7 @@ by some undesirable path component.
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 370ad0d34076..71ffe14eede3 100644
index 2caa131ff306..137fef42fcdc 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

View File

@ -1,4 +1,4 @@
From 3f663c7c948f7a43b83989c22b004f293964ef12 Mon Sep 17 00:00:00 2001
From 348ea7b7ed77d5591ef961ddc0626750cf7662a1 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

View File

@ -1,4 +1,4 @@
From 3999e5c349688f0c9bf50cc70622b66fccbf6289 Mon Sep 17 00:00:00 2001
From 5f37f63dd27c02a7f323a0afdad42a762209a6ab 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