mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-20 05:51:18 +02:00
Merge pull request #3424 from dm0-/linux
Bump Linux 4.14.72 to 4.14.73 and 4.18.10 to 4.18.11
This commit is contained in:
David Michael
GitHub
commit
4fef4a4098
@ -1,12 +1,12 @@
|
||||
DEFINED_PHASES=compile configure install prepare pretend setup unpack
|
||||
DEPEND==sys-kernel/coreos-modules-4.14.72 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less 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.14.72
|
||||
DEPEND==sys-kernel/coreos-modules-4.14.73 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less 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.14.73
|
||||
DESCRIPTION=CoreOS Linux kernel
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kernel.org
|
||||
KEYWORDS=amd64
|
||||
LICENSE=GPL-2 freedist
|
||||
RDEPEND==sys-kernel/coreos-modules-4.14.72
|
||||
RDEPEND==sys-kernel/coreos-modules-4.14.73
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=0/4.14.72
|
||||
SLOT=0/4.14.73
|
||||
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=8d9003850e9a0961c3daa40b252ccb37
|
||||
@ -1,12 +1,12 @@
|
||||
DEFINED_PHASES=compile configure install prepare pretend setup unpack
|
||||
DEPEND==sys-kernel/coreos-modules-4.18.10 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less 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.18.10
|
||||
DEPEND==sys-kernel/coreos-modules-4.18.11 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less 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.18.11
|
||||
DESCRIPTION=CoreOS Linux kernel
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kernel.org
|
||||
KEYWORDS=amd64
|
||||
LICENSE=GPL-2 freedist
|
||||
RDEPEND==sys-kernel/coreos-modules-4.18.10
|
||||
RDEPEND==sys-kernel/coreos-modules-4.18.11
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=0/4.18.10
|
||||
SLOT=0/4.18.11
|
||||
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=8d9003850e9a0961c3daa40b252ccb37
|
||||
@ -1,5 +1,5 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
|
||||
DEPEND==sys-kernel/coreos-sources-4.14.72
|
||||
DEPEND==sys-kernel/coreos-sources-4.14.73
|
||||
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.14.72
|
||||
SLOT=0/4.14.73
|
||||
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=9bfb20f0c6dec0fbb70b49ec01ba693f
|
||||
@ -1,5 +1,5 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
|
||||
DEPEND==sys-kernel/coreos-sources-4.18.10
|
||||
DEPEND==sys-kernel/coreos-sources-4.18.11
|
||||
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.18.10
|
||||
SLOT=0/4.18.11
|
||||
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=9bfb20f0c6dec0fbb70b49ec01ba693f
|
||||
@ -8,7 +8,7 @@ KEYWORDS=amd64
|
||||
LICENSE=GPL-2 linux-firmware
|
||||
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=4.14.72
|
||||
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.72.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
|
||||
SLOT=4.14.73
|
||||
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.73.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
|
||||
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=785aff8bdcf31c6a6d8916b86044f14f
|
||||
@ -8,7 +8,7 @@ KEYWORDS=amd64
|
||||
LICENSE=GPL-2 linux-firmware
|
||||
RDEPEND=sys-devel/bison sys-devel/flex !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=4.18.10
|
||||
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.18.10.xz mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz
|
||||
SLOT=4.18.11
|
||||
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.18.11.xz mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz
|
||||
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=21f68c0a62dfae6f2132e8ff35aed589
|
||||
@ -1,4 +1,4 @@
|
||||
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
|
||||
DIST linux-4.18.tar.xz 101781564 BLAKE2B 138bdc49dc8871e5566b5e23a9e5ed0e68fff480a7a04fc659a9efe2d4bcc778ac01368a32bc5d1dbde870102ce7294b9d315f81c4e6e762ee781135e83033f2 SHA512 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038
|
||||
DIST patch-4.14.72.xz 1782932 BLAKE2B 667f6d199df60d0c25f2dc79977e531786560ca11b974a428506dc783ec982cfb7ad69afb1953896c320c2d956779569888ec073fd8003186eb39f879124234f SHA512 de7063521534454f17d113af463a2ab4b855ce7c6123ce7bfd34d04e7ab7d286531152844303618f599c8030a5ef0c4a862ada7178a07b82c203e6a395f7ff2c
|
||||
DIST patch-4.18.10.xz 284032 BLAKE2B a528bdffc6c58de639b0b04d50f78f12bb137bb092aea1047d9f9a4f82d543b62904dd7aaef90422f72c16cdfcbac035cce3f04f14f292125c4d3cbf64793de7 SHA512 ff00f5b50921654494bf0cc290a82871bf3f053dc170abbde906499e3bffe1f368a94a6c09196ded618ae46fe2fa74e05b4e594f31ccc08a7071efa1e9ec4a68
|
||||
DIST patch-4.14.73.xz 1791804 BLAKE2B 35e65123bf1c982170a559174eeb94bc009b44f74bb924f454e855fadfe50978941a6152e445e14cbd13adbb6af54d3c126f98711888a38ba37f1fbe30606897 SHA512 d509365295b6bb5ad55d8859a6cc7cae00ef7b7b34aef21167fcfc992accbf9ac1f4191446c911b55844b09ff0c7f83fd422aea71c2877521331b7b0e05a9205
|
||||
DIST patch-4.18.11.xz 304168 BLAKE2B 2394fc1b81857c815b7d7174e122cf34cede401c58de5f6c766afa216d109fca3fee7ebb7e88695a0dc916a493b7cbe6c98356bf1efa7fb4a1167659ae41582f SHA512 a1cfab9c4fb7bec8da33fa95da0986ed7605ff9953fd425f5122978c462a6024886955827ce52a87f93312d5e17a4533606bbabf3e6ad6a5dd353d430db92e7e
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From b83e77602538205cbc2a0511e529f34ad0b2cd1d Mon Sep 17 00:00:00 2001
|
||||
From 4eca5739cad467454be3f7f7723ed2010a35b60a 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 734722bda173..f133c9f927e1 100644
|
||||
index 89f30ca964b6..137367baea4f 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 133cc3fef4ee545f8217945998eef2f10cd67e35 Mon Sep 17 00:00:00 2001
|
||||
From afe35b9cc6909888964b85a328bf99f62a91b0b8 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
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 52a5fcf3447aa2e0d9ef5cf2ee67fc3cd86db591 Mon Sep 17 00:00:00 2001
|
||||
From 091facbd059cdb65ee8af4ee607563d237f26706 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Lagerwall <ross.lagerwall@citrix.com>
|
||||
Date: Thu, 21 Jun 2018 14:00:20 +0100
|
||||
Subject: [PATCH 3/4] xen-netfront: Fix mismatched rtnl_unlock
|
||||
@ -13,10 +13,10 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
|
||||
index d80343429de5..cc4fe86db39e 100644
|
||||
index 1a40fc3517a8..3cb39e089cd0 100644
|
||||
--- a/drivers/net/xen-netfront.c
|
||||
+++ b/drivers/net/xen-netfront.c
|
||||
@@ -1818,7 +1818,7 @@ static int talk_to_netback(struct xenbus_device *dev,
|
||||
@@ -1824,7 +1824,7 @@ static int talk_to_netback(struct xenbus_device *dev,
|
||||
err = xen_net_read_mac(dev, info->netdev->dev_addr);
|
||||
if (err) {
|
||||
xenbus_dev_fatal(dev, err, "parsing %s/mac", dev->nodename);
|
||||
@ -25,7 +25,7 @@ index d80343429de5..cc4fe86db39e 100644
|
||||
}
|
||||
|
||||
rtnl_lock();
|
||||
@@ -1933,6 +1933,7 @@ static int talk_to_netback(struct xenbus_device *dev,
|
||||
@@ -1939,6 +1939,7 @@ static int talk_to_netback(struct xenbus_device *dev,
|
||||
xennet_destroy_queues(info);
|
||||
out:
|
||||
rtnl_unlock();
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From b213c4c77fcd72aa433981597a702f96ac7e1ec1 Mon Sep 17 00:00:00 2001
|
||||
From 26c1ae6f481be2d41d98c4e4229e28f8ac3f2d71 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Lagerwall <ross.lagerwall@citrix.com>
|
||||
Date: Thu, 21 Jun 2018 14:00:21 +0100
|
||||
Subject: [PATCH 4/4] xen-netfront: Update features after registering netdev
|
||||
@ -19,10 +19,10 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
|
||||
index cc4fe86db39e..bc0363e2bdb1 100644
|
||||
index 3cb39e089cd0..6ea95b316256 100644
|
||||
--- a/drivers/net/xen-netfront.c
|
||||
+++ b/drivers/net/xen-netfront.c
|
||||
@@ -1959,10 +1959,6 @@ static int xennet_connect(struct net_device *dev)
|
||||
@@ -1965,10 +1965,6 @@ static int xennet_connect(struct net_device *dev)
|
||||
/* talk_to_netback() sets the correct number of queues */
|
||||
num_queues = dev->real_num_tx_queues;
|
||||
|
||||
@ -33,7 +33,7 @@ index cc4fe86db39e..bc0363e2bdb1 100644
|
||||
if (dev->reg_state == NETREG_UNINITIALIZED) {
|
||||
err = register_netdev(dev);
|
||||
if (err) {
|
||||
@@ -1972,6 +1968,10 @@ static int xennet_connect(struct net_device *dev)
|
||||
@@ -1978,6 +1974,10 @@ static int xennet_connect(struct net_device *dev)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From d113e46b802b1c6df4058391ee29722c5b426897 Mon Sep 17 00:00:00 2001
|
||||
From 56e6c99259c90dd46e251729038444ab52377567 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 ffab15235ff0..78f148baa2ca 100644
|
||||
index de0ecace693a..747037f3854e 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 8c1ff97d0bff8d6cc98b43232724fd0fc49c4a0c Mon Sep 17 00:00:00 2001
|
||||
From 4c2984bf1a095322b5a232a52656466d7f7310e9 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
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From d1709aabfc4abf5c37d41faa9c4108abf6cd7351 Mon Sep 17 00:00:00 2001
|
||||
From af1bacba150ae5bb462ac71c669f59e0676048eb Mon Sep 17 00:00:00 2001
|
||||
From: "Kirill A. Shutemov" <kirill@shutemov.name>
|
||||
Date: Wed, 4 Jul 2018 18:08:57 +0300
|
||||
Subject: [PATCH 3/4] 4.17.x won't boot due to "x86/boot/compressed/64: Handle
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f3334a2354a85d50f83a4d7a09a56fd1e06d1895 Mon Sep 17 00:00:00 2001
|
||||
From c2d876c9d1ab97fb693ff9d51353dcdec2deb684 Mon Sep 17 00:00:00 2001
|
||||
From: David Michael <dm0@redhat.com>
|
||||
Date: Wed, 15 Aug 2018 12:50:10 -0400
|
||||
Subject: [PATCH 4/4] Revert "net: increase fragment memory usage limits"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user