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

Commit

Permalink
Merge pull request #3420 from dm0-/build-1911
Browse files Browse the repository at this point in the history
Bump Linux 4.14.71 to 4.14.72 and 4.18.9 to 4.18.10 in alpha
  • Loading branch information
dm0- authored Sep 27, 2018
2 parents 5d2e6c2 + d768da2 commit 25769fd
Show file tree
Hide file tree
Showing 22 changed files with 41 additions and 41 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare pretend setup unpack
DEPEND==sys-kernel/coreos-modules-4.14.71 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.71
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
DESCRIPTION=CoreOS Linux kernel
EAPI=5
HOMEPAGE=http://www.kernel.org
KEYWORDS=amd64
LICENSE=GPL-2 freedist
RDEPEND==sys-kernel/coreos-modules-4.14.71
RDEPEND==sys-kernel/coreos-modules-4.14.72
RESTRICT=binchecks strip
SLOT=0/4.14.71
SLOT=0/4.14.72
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=8d9003850e9a0961c3daa40b252ccb37
12 changes: 12 additions & 0 deletions metadata/md5-cache/sys-kernel/coreos-kernel-4.18.10
Original file line number Diff line number Diff line change
@@ -0,0 +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
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
RESTRICT=binchecks strip
SLOT=0/4.18.10
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=8d9003850e9a0961c3daa40b252ccb37
12 changes: 0 additions & 12 deletions metadata/md5-cache/sys-kernel/coreos-kernel-4.18.9

This file was deleted.

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.14.71
DEPEND==sys-kernel/coreos-sources-4.14.72
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.14.71
SLOT=0/4.14.72
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=9bfb20f0c6dec0fbb70b49ec01ba693f
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.18.9
DEPEND==sys-kernel/coreos-sources-4.18.10
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.18.9
SLOT=0/4.18.10
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=9bfb20f0c6dec0fbb70b49ec01ba693f
Original file line number Diff line number Diff line change
Expand Up @@ -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.71
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.71.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
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
_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
Original file line number Diff line number Diff line change
Expand Up @@ -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.9
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.18.9.xz mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz
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
_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
4 changes: 2 additions & 2 deletions sys-kernel/coreos-sources/Manifest
Original file line number Diff line number Diff line change
@@ -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.71.xz 1755512 BLAKE2B df4194c2540ebfd7ef39045c7af03e2211e42dd0efcc47cf09b852c1a042960ecf339e17ecf0424dae3be1601a3787b81aded5edad0b4c85077d7468a8ad2788 SHA512 2c3a330a25c6f563a6a5c4462d2c43b3184bd7c1fe619d2166d7cb46157f7e8a17105116449d7a695f63242fa9ce48037681e5980e93dcc7dac2b94e0a42f34d
DIST patch-4.18.9.xz 230916 BLAKE2B 839100aec7129409bb00434e52c8acae863e61edaee4c46bf770374c089eb2a9914acedec70a9bede533784513c32149206b4f767be07cd4ba42b93ccb3a308b SHA512 1ef82764f93a96e759a1b969ce965c0981f86a5d6e2376e7f637209ea1114ce2636bb41971e616973ce8a55692999086f75e465dd96deb77876e9a2fd6ceddc4
DIST patch-4.14.72.xz 1782932 BLAKE2B 667f6d199df60d0c25f2dc79977e531786560ca11b974a428506dc783ec982cfb7ad69afb1953896c320c2d956779569888ec073fd8003186eb39f879124234f SHA512 de7063521534454f17d113af463a2ab4b855ce7c6123ce7bfd34d04e7ab7d286531152844303618f599c8030a5ef0c4a862ada7178a07b82c203e6a395f7ff2c
DIST patch-4.18.10.xz 284032 BLAKE2B a528bdffc6c58de639b0b04d50f78f12bb137bb092aea1047d9f9a4f82d543b62904dd7aaef90422f72c16cdfcbac035cce3f04f14f292125c4d3cbf64793de7 SHA512 ff00f5b50921654494bf0cc290a82871bf3f053dc170abbde906499e3bffe1f368a94a6c09196ded618ae46fe2fa74e05b4e594f31ccc08a7071efa1e9ec4a68
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9776b344e15a0614360a3cda647b84e9a963b007 Mon Sep 17 00:00:00 2001
From b83e77602538205cbc2a0511e529f34ad0b2cd1d Mon Sep 17 00:00:00 2001
From: Vito Caputo <[email protected]>
Date: Wed, 25 Nov 2015 02:59:45 -0800
Subject: [PATCH 1/4] 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 dd4eaeeb2050..80a5a9e0f03c 100644
index 734722bda173..f133c9f927e1 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 87fe0e22f6ba5cfecdb9fda4c17c8ebcdd31355d Mon Sep 17 00:00:00 2001
From 133cc3fef4ee545f8217945998eef2f10cd67e35 Mon Sep 17 00:00:00 2001
From: David Michael <[email protected]>
Date: Thu, 8 Feb 2018 21:23:12 -0500
Subject: [PATCH 2/4] tools/objtool/Makefile: Don't fail on fallthrough with
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 26cbc9599e1c002071ed12fdb937ead86a8a49b3 Mon Sep 17 00:00:00 2001
From 52a5fcf3447aa2e0d9ef5cf2ee67fc3cd86db591 Mon Sep 17 00:00:00 2001
From: Ross Lagerwall <[email protected]>
Date: Thu, 21 Jun 2018 14:00:20 +0100
Subject: [PATCH 3/4] xen-netfront: Fix mismatched rtnl_unlock
Expand All @@ -13,10 +13,10 @@ Signed-off-by: David S. Miller <[email protected]>
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index d5e790dd589a..d7dc95f58dae 100644
index d80343429de5..cc4fe86db39e 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1817,7 +1817,7 @@ static int talk_to_netback(struct xenbus_device *dev,
@@ -1818,7 +1818,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);
Expand All @@ -25,7 +25,7 @@ index d5e790dd589a..d7dc95f58dae 100644
}

rtnl_lock();
@@ -1932,6 +1932,7 @@ static int talk_to_netback(struct xenbus_device *dev,
@@ -1933,6 +1933,7 @@ static int talk_to_netback(struct xenbus_device *dev,
xennet_destroy_queues(info);
out:
rtnl_unlock();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From cd43fe5ac9411608f0db670fd07c89037b3eae56 Mon Sep 17 00:00:00 2001
From b213c4c77fcd72aa433981597a702f96ac7e1ec1 Mon Sep 17 00:00:00 2001
From: Ross Lagerwall <[email protected]>
Date: Thu, 21 Jun 2018 14:00:21 +0100
Subject: [PATCH 4/4] xen-netfront: Update features after registering netdev
Expand All @@ -19,10 +19,10 @@ Signed-off-by: David S. Miller <[email protected]>
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index d7dc95f58dae..31bc4210f969 100644
index cc4fe86db39e..bc0363e2bdb1 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1958,10 +1958,6 @@ static int xennet_connect(struct net_device *dev)
@@ -1959,10 +1959,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;

Expand All @@ -33,7 +33,7 @@ index d7dc95f58dae..31bc4210f969 100644
if (dev->reg_state == NETREG_UNINITIALIZED) {
err = register_netdev(dev);
if (err) {
@@ -1971,6 +1967,10 @@ static int xennet_connect(struct net_device *dev)
@@ -1972,6 +1968,10 @@ static int xennet_connect(struct net_device *dev)
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3b1cc5069f3536737e38959640ae2f9bb9b74b6f Mon Sep 17 00:00:00 2001
From d113e46b802b1c6df4058391ee29722c5b426897 Mon Sep 17 00:00:00 2001
From: Vito Caputo <[email protected]>
Date: Wed, 25 Nov 2015 02:59:45 -0800
Subject: [PATCH 1/4] 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 1178348fb9ca..fc04daaa5287 100644
index ffab15235ff0..78f148baa2ca 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 7145eaa544c3fed86505ec54182b3d85c7b68202 Mon Sep 17 00:00:00 2001
From 8c1ff97d0bff8d6cc98b43232724fd0fc49c4a0c Mon Sep 17 00:00:00 2001
From: David Michael <[email protected]>
Date: Thu, 8 Feb 2018 21:23:12 -0500
Subject: [PATCH 2/4] tools/objtool/Makefile: Don't fail on fallthrough with
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1ae29aef5b3e14d3d2e90218193d846608f3efe0 Mon Sep 17 00:00:00 2001
From d1709aabfc4abf5c37d41faa9c4108abf6cd7351 Mon Sep 17 00:00:00 2001
From: "Kirill A. Shutemov" <[email protected]>
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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 16bdc341b3220665a3383f71f099a4350e24b161 Mon Sep 17 00:00:00 2001
From f3334a2354a85d50f83a4d7a09a56fd1e06d1895 Mon Sep 17 00:00:00 2001
From: David Michael <[email protected]>
Date: Wed, 15 Aug 2018 12:50:10 -0400
Subject: [PATCH 4/4] Revert "net: increase fragment memory usage limits"
Expand Down

0 comments on commit 25769fd

Please sign in to comment.