mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-19 21:41:05 +02:00
sys-kernel/coreos-sources: Bump 4.14.78 to 4.14.79
This commit is contained in:
parent
d28557768c
commit
bbccfe24f3
@ -1,13 +1,13 @@
|
|||||||
DEFINED_PHASES=compile configure install prepare pretend setup unpack
|
DEFINED_PHASES=compile configure install prepare pretend setup unpack
|
||||||
DEPEND==sys-kernel/coreos-modules-4.14.78 app-arch/gzip app-shells/bash 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.14.78
|
DEPEND==sys-kernel/coreos-modules-4.14.79 app-arch/gzip app-shells/bash 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.14.79
|
||||||
DESCRIPTION=CoreOS Linux kernel
|
DESCRIPTION=CoreOS Linux kernel
|
||||||
EAPI=5
|
EAPI=5
|
||||||
HOMEPAGE=http://www.kernel.org
|
HOMEPAGE=http://www.kernel.org
|
||||||
IUSE=kernel_linux
|
IUSE=kernel_linux
|
||||||
KEYWORDS=amd64
|
KEYWORDS=amd64
|
||||||
LICENSE=GPL-2 freedist
|
LICENSE=GPL-2 freedist
|
||||||
RDEPEND==sys-kernel/coreos-modules-4.14.78
|
RDEPEND==sys-kernel/coreos-modules-4.14.79
|
||||||
RESTRICT=binchecks strip
|
RESTRICT=binchecks strip
|
||||||
SLOT=0/4.14.78
|
SLOT=0/4.14.79
|
||||||
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861
|
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861
|
||||||
_md5_=6dab206f9cd5286ae76f6cfe73096848
|
_md5_=42753b8cebb468da769ebfda0bcf0620
|
@ -1,5 +1,5 @@
|
|||||||
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
|
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
|
||||||
DEPEND==sys-kernel/coreos-sources-4.14.78
|
DEPEND==sys-kernel/coreos-sources-4.14.79
|
||||||
DESCRIPTION=CoreOS Linux kernel modules
|
DESCRIPTION=CoreOS Linux kernel modules
|
||||||
EAPI=5
|
EAPI=5
|
||||||
HOMEPAGE=http://www.kernel.org
|
HOMEPAGE=http://www.kernel.org
|
||||||
@ -8,6 +8,6 @@ KEYWORDS=amd64
|
|||||||
LICENSE=GPL-2 freedist
|
LICENSE=GPL-2 freedist
|
||||||
RDEPEND=!<sys-kernel/coreos-kernel-4.6.3-r1
|
RDEPEND=!<sys-kernel/coreos-kernel-4.6.3-r1
|
||||||
RESTRICT=binchecks strip
|
RESTRICT=binchecks strip
|
||||||
SLOT=0/4.14.78
|
SLOT=0/4.14.79
|
||||||
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs f164325a2cdb5b3ea39311d483988861
|
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs f164325a2cdb5b3ea39311d483988861
|
||||||
_md5_=9bfb20f0c6dec0fbb70b49ec01ba693f
|
_md5_=9bfb20f0c6dec0fbb70b49ec01ba693f
|
@ -8,7 +8,7 @@ KEYWORDS=amd64
|
|||||||
LICENSE=GPL-2 linux-firmware
|
LICENSE=GPL-2 linux-firmware
|
||||||
RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
|
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
|
RESTRICT=binchecks strip
|
||||||
SLOT=4.14.78
|
SLOT=4.14.79
|
||||||
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.78.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
|
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.79.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
|
||||||
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 kernel-2 bc2f2b5caeb6f89c673a8a4dced6511e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
|
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 kernel-2 bc2f2b5caeb6f89c673a8a4dced6511e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
|
||||||
_md5_=785aff8bdcf31c6a6d8916b86044f14f
|
_md5_=3e863356505b5ff924eed92178facb0b
|
@ -54,6 +54,7 @@ pkg_setup() {
|
|||||||
src_prepare() {
|
src_prepare() {
|
||||||
# KV_OUT_DIR points to the minimal build tree installed by coreos-modules
|
# KV_OUT_DIR points to the minimal build tree installed by coreos-modules
|
||||||
# Pull in the config and public module signing key
|
# Pull in the config and public module signing key
|
||||||
|
KV_OUT_DIR="${ROOT%/}/lib/modules/${COREOS_SOURCE_NAME#linux-}/build"
|
||||||
cp -v "${KV_OUT_DIR}/.config" build/ || die
|
cp -v "${KV_OUT_DIR}/.config" build/ || die
|
||||||
local sig_key="$(getconfig MODULE_SIG_KEY)"
|
local sig_key="$(getconfig MODULE_SIG_KEY)"
|
||||||
mkdir -p "build/${sig_key%/*}" || die
|
mkdir -p "build/${sig_key%/*}" || die
|
@ -1,4 +1,4 @@
|
|||||||
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
|
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
|
||||||
DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
|
DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
|
||||||
DIST patch-4.14.78.xz 1888728 BLAKE2B 37d2cf9594422748e493b7d7b000917a45fb5d231b088945f8a458d522b7c42754beb2bed138b562c823d5aaa31c2c9dcda276a9460e57fb857899037c4777d8 SHA512 bf0c0cbe9ee7ddfee0d8a70656e6db5979d1928c7aad917039c471ad6e2b049fe9d0f59161dab5ccfb9180263d2630cd6df735524b5886f0d05f709cb30b11bd
|
DIST patch-4.14.79.xz 1912592 BLAKE2B 6bfb02b18c36c7dda7e221be6e15eb0fc7e28bdf238945c3251029eb32784cb800920482b519ea2bc399b8653d1c6d8c55fba2bd65514e268f22c73cad2cd988 SHA512 ffc35dc4265fe9e111721d3734dca1ec312f84262a273a314d58689fb5492da8f760f6774bab420c752d76fe986fb38dfe9a8a4a389709517ec1166745d0d48d
|
||||||
DIST patch-4.19.1.xz 9664 BLAKE2B 936fc38071acf9f3f9cdd542d7cb9dddefcf8ca40d8186fd1d3af7de9c542eb25fa55633a2d7c689d39b0f45ddf1ec46e86ca1c8f8db7423b0fe446cd44684fe SHA512 10e1f3c1ffbcd14a16005e06a3c7f025c37061e4d2eddca31639f70d813c9d98c3a032c328dde2f41799064656e6430a76e8a297fe42173d572e3080ba2026aa
|
DIST patch-4.19.1.xz 9664 BLAKE2B 936fc38071acf9f3f9cdd542d7cb9dddefcf8ca40d8186fd1d3af7de9c542eb25fa55633a2d7c689d39b0f45ddf1ec46e86ca1c8f8db7423b0fe446cd44684fe SHA512 10e1f3c1ffbcd14a16005e06a3c7f025c37061e4d2eddca31639f70d813c9d98c3a032c328dde2f41799064656e6430a76e8a297fe42173d572e3080ba2026aa
|
||||||
|
@ -33,6 +33,4 @@ IUSE=""
|
|||||||
UNIPATCH_LIST="
|
UNIPATCH_LIST="
|
||||||
${PATCH_DIR}/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch \
|
${PATCH_DIR}/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch \
|
||||||
${PATCH_DIR}/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \
|
${PATCH_DIR}/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \
|
||||||
${PATCH_DIR}/z0003-xen-netfront-Fix-mismatched-rtnl_unlock.patch \
|
|
||||||
${PATCH_DIR}/z0004-xen-netfront-Update-features-after-registering-netde.patch \
|
|
||||||
"
|
"
|
@ -1,7 +1,7 @@
|
|||||||
From db3795ffb9f79a0429e1e7793371c54da70bac32 Mon Sep 17 00:00:00 2001
|
From 912152f80748f846bbfa8285f894d1293557f372 Mon Sep 17 00:00:00 2001
|
||||||
From: Vito Caputo <vito.caputo@coreos.com>
|
From: Vito Caputo <vito.caputo@coreos.com>
|
||||||
Date: Wed, 25 Nov 2015 02:59:45 -0800
|
Date: Wed, 25 Nov 2015 02:59:45 -0800
|
||||||
Subject: [PATCH 1/4] kbuild: derive relative path for KBUILD_SRC from CURDIR
|
Subject: [PATCH 1/2] kbuild: derive relative path for KBUILD_SRC from CURDIR
|
||||||
|
|
||||||
This enables relocating source and build trees to different roots,
|
This enables relocating source and build trees to different roots,
|
||||||
provided they stay reachable relative to one another. Useful for
|
provided they stay reachable relative to one another. Useful for
|
||||||
@ -12,7 +12,7 @@ by some undesirable path component.
|
|||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
diff --git a/Makefile b/Makefile
|
||||||
index 89574ee68d6b..cc474a84ec64 100644
|
index 57a007bf1181..58f13b979782 100644
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
|
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From d1722a890576e53b1b457b42659035085e83f04f Mon Sep 17 00:00:00 2001
|
From c43bc7dd8576ce954cdb305a63383ceeb59bf34b Mon Sep 17 00:00:00 2001
|
||||||
From: David Michael <david.michael@coreos.com>
|
From: David Michael <david.michael@coreos.com>
|
||||||
Date: Thu, 8 Feb 2018 21:23:12 -0500
|
Date: Thu, 8 Feb 2018 21:23:12 -0500
|
||||||
Subject: [PATCH 2/4] tools/objtool/Makefile: Don't fail on fallthrough with
|
Subject: [PATCH 2/2] tools/objtool/Makefile: Don't fail on fallthrough with
|
||||||
new GCCs
|
new GCCs
|
||||||
|
|
||||||
---
|
---
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
From e2ce23d1b8d629963802671a6feeb6ea10d431e9 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
|
|
||||||
|
|
||||||
Fixes: f599c64fdf7d ("xen-netfront: Fix race between device setup and open")
|
|
||||||
Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
|
|
||||||
Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
|
|
||||||
Reviewed-by: Juergen Gross <jgross@suse.com>
|
|
||||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
||||||
---
|
|
||||||
drivers/net/xen-netfront.c | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
|
|
||||||
index 1a40fc3517a8..3cb39e089cd0 100644
|
|
||||||
--- a/drivers/net/xen-netfront.c
|
|
||||||
+++ b/drivers/net/xen-netfront.c
|
|
||||||
@@ -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);
|
|
||||||
- goto out;
|
|
||||||
+ goto out_unlocked;
|
|
||||||
}
|
|
||||||
|
|
||||||
rtnl_lock();
|
|
||||||
@@ -1939,6 +1939,7 @@ static int talk_to_netback(struct xenbus_device *dev,
|
|
||||||
xennet_destroy_queues(info);
|
|
||||||
out:
|
|
||||||
rtnl_unlock();
|
|
||||||
+out_unlocked:
|
|
||||||
device_unregister(&dev->dev);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.17.2
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
|||||||
From 898a9b553c198b1ee6b1fe276706948cced0cb25 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
|
|
||||||
|
|
||||||
Update the features after calling register_netdev() otherwise the
|
|
||||||
device features are not set up correctly and it not possible to change
|
|
||||||
the MTU of the device. After this change, the features reported by
|
|
||||||
ethtool match the device's features before the commit which introduced
|
|
||||||
the issue and it is possible to change the device's MTU.
|
|
||||||
|
|
||||||
Fixes: f599c64fdf7d ("xen-netfront: Fix race between device setup and open")
|
|
||||||
Reported-by: Liam Shepherd <liam@dancer.es>
|
|
||||||
Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
|
|
||||||
Reviewed-by: Juergen Gross <jgross@suse.com>
|
|
||||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
||||||
---
|
|
||||||
drivers/net/xen-netfront.c | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
|
|
||||||
index 3cb39e089cd0..6ea95b316256 100644
|
|
||||||
--- a/drivers/net/xen-netfront.c
|
|
||||||
+++ b/drivers/net/xen-netfront.c
|
|
||||||
@@ -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;
|
|
||||||
|
|
||||||
- rtnl_lock();
|
|
||||||
- netdev_update_features(dev);
|
|
||||||
- rtnl_unlock();
|
|
||||||
-
|
|
||||||
if (dev->reg_state == NETREG_UNINITIALIZED) {
|
|
||||||
err = register_netdev(dev);
|
|
||||||
if (err) {
|
|
||||||
@@ -1978,6 +1974,10 @@ static int xennet_connect(struct net_device *dev)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ rtnl_lock();
|
|
||||||
+ netdev_update_features(dev);
|
|
||||||
+ rtnl_unlock();
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* All public and private state should now be sane. Get
|
|
||||||
* ready to start sending and receiving packets and give the driver
|
|
||||||
--
|
|
||||||
2.17.2
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user