Merge pull request #3608 from dm0-/linux

Bump Linux 4.19.28 to 4.19.29
coreos · Mar 14, 2019 · 239aec6 · 239aec6
2 parents d389676 + 32f07d5
commit 239aec6
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/...d5-cache/sys-kernel/coreos-kernel-4.19.28 → ...d5-cache/sys-kernel/coreos-kernel-4.19.29 b/...d5-cache/sys-kernel/coreos-kernel-4.19.28 → ...d5-cache/sys-kernel/coreos-kernel-4.19.29
@@ -1,13 +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
+DEPEND==sys-kernel/coreos-modules-4.19.29 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.29
 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
+RDEPEND==sys-kernel/coreos-modules-4.19.29
 RESTRICT=binchecks strip
-SLOT=0/4.19.28
+SLOT=0/4.19.29
 _eclasses_=coreos-kernel	588460f26859c559935beb69c53cb5c0	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=1a19bf8157015b4dcd933d7281d1920d
diff --git a/...5-cache/sys-kernel/coreos-modules-4.19.28 → ...5-cache/sys-kernel/coreos-modules-4.19.29 b/...5-cache/sys-kernel/coreos-modules-4.19.28 → ...5-cache/sys-kernel/coreos-modules-4.19.29
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-sources-4.19.28
+DEPEND==sys-kernel/coreos-sources-4.19.29
 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.28
+SLOT=0/4.19.29
 _eclasses_=coreos-kernel	588460f26859c559935beb69c53cb5c0	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=9bfb20f0c6dec0fbb70b49ec01ba693f
diff --git a/...5-cache/sys-kernel/coreos-sources-4.19.28 → ...5-cache/sys-kernel/coreos-sources-4.19.29 b/...5-cache/sys-kernel/coreos-sources-4.19.28 → ...5-cache/sys-kernel/coreos-sources-4.19.29
@@ -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.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
+SLOT=4.19.29
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.29.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/...oreos-kernel/coreos-kernel-4.19.28.ebuild → ...oreos-kernel/coreos-kernel-4.19.29.ebuild b/...oreos-kernel/coreos-kernel-4.19.28.ebuild → ...oreos-kernel/coreos-kernel-4.19.29.ebuild
diff --git a/...eos-modules/coreos-modules-4.19.28.ebuild → ...eos-modules/coreos-modules-4.19.29.ebuild b/...eos-modules/coreos-modules-4.19.28.ebuild → ...eos-modules/coreos-modules-4.19.29.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.28.xz 792280 BLAKE2B 1abb83c11972d1ed141bf2a4eb733a30e4899147f5519e530e457b924016f4a67204ae50db8cc606b96d812928d66b6549b353d32295944b08f5ffc5708e51d1 SHA512 8c8a94b0922ac52bc20dc29d900cdd358f9019d57d0510e16d0cc9348dd5df97fe68f2aa59a70beae6e8d21a82f0024cc0c509d828c4be5b6adad9dc8b14cafa
+DIST patch-4.19.29.xz 827332 BLAKE2B 56a2bfc1300f4334af301cb83304f36313feea1274b5dcacebad5cd122001373f3753f0f4808a9ba63683a7560af348dce42e5f318ff223f26c8ee5e8621666f SHA512 045651040ae028b6bec1cef83b6d498e73cc701a88321c6f58ad0c113eafc9f783d94c756e567fa3b40551d666c0386936f05a6284237a47b64cb89d4270f4bf
diff --git a/...eos-sources/coreos-sources-4.19.28.ebuild → ...eos-sources/coreos-sources-4.19.29.ebuild b/...eos-sources/coreos-sources-4.19.28.ebuild → ...eos-sources/coreos-sources-4.19.29.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 8d6217ff0796aacb9e0eea0ea3c3c35a40e86cb3 Mon Sep 17 00:00:00 2001
+From a61c1f718be6b78de0ab6deaf754d3516f706a0c 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 c6ac023ba33a..2640ab9e812e 100644
+index 6e526583291c..6127cf99fe70 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 8d4d9e7f722d24adfdd24a9763840cb99f04f60b Mon Sep 17 00:00:00 2001
+From d21f764186dec35ac2c2f6642974f9045f6511e1 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

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 f3b4aa346e4c33c2df8b85efcb26cfe9d14d9a72 Mon Sep 17 00:00:00 2001
+From aa095cf90fd24a4150a1d63248851a9de6e89185 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