mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 14:31:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3022 from coreosbot/master-4.14.15

Browse Source 
Upgrade Linux in master to 4.14.15
This commit is contained in:
David Michael 2018-01-23 18:21:19 -05:00 committed by GitHub
commit e1fa54f735
9 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.14-r1.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.15.ebuild vendored
View File

0
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.14-r1.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.15.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest vendored
View File

@ -1,2 +1,2 @@
DIST linux-4.14.tar.xz 100770500 SHA256 f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7 SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 WHIRLPOOL fee10d54ecb210156aa55364ecc15867127819e9f7ff9ec5f6ef159b1013e2ae3d3a28d35c62d663886cbe826b996a1387671766093be002536309045a8e4d10
DIST patch-4.14.14.xz 430628 SHA256 62d656b98f0dc143216cb9650bd9b96cd83d92925731e9f0bec5eb4d6358e603 SHA512 abc13c99eb85b2bd25f3ac07fccdad52a801118a86d3cd153a8ca6254730e5604e34261e98945352b23cf0e0a0317074a5008701d1240cc958ef4199bffd1ab6 WHIRLPOOL 3347d8ac45db826e2d190ff29a51304864859df1e654b92ced0060eef2f0c53e0de403d8826dcb7750c05fb6eda7a5348d4594ff2d48a43c10fc92c6c87392e7
DIST patch-4.14.15.xz 457912 SHA256 54a6359ed333e619db8c5c88020ff20f1e25635337f01f50a7488ec2fc0fe030 SHA512 faf165072fcff9f6f8cec76f0c35cf422afc453dfa2fc9ab5bc918eb177ebefd1e305f2c994a90c9dff073151762d79359789d118307ba15f53a020426c291a8 WHIRLPOOL 69cec85545b991849721c193b29b67ff73e609b1e6f8c98c9b49a770ec773d5c39ffef44c248b9ef718d910437114a98b5ef8f06de30ac90ca221eb13bbf38c4

10
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.14.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.15.ebuild vendored
View File

@ -26,16 +26,6 @@ fi
KEYWORDS="amd64 arm64"
IUSE=""
# For 4.14 >= 4.14.10
src_install() {
kernel-2_src_install
local r="${PR#r0}"
local script="${ED}/usr/src/linux-${PV/_rc/-rc}-coreos${r:+-${r}}/tools/objtool/sync-check.sh"
if [[ -e "${script}" ]]; then
chmod +x "${script}" || die
fi
}
# XXX: Note we must prefix the patch filenames with "z" to ensure they are
# applied _after_ a potential patch-${KV}.patch file, present when building a
# patchlevel revision. We mustn't apply our patches first, it fails when the

4
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch vendored
View File

@ -1,4 +1,4 @@
From 80a63aa9e051e27c9073fe9c9db4f3e8b6a3f2d5 Mon Sep 17 00:00:00 2001
From 5905a90895e7afef928bf92abee45d642b744cfd 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/5] 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 4951305eb867..6dc766f58bff 100644
index bf1a277a67a4..c1b02af2c9f2 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch vendored
View File

@ -1,4 +1,4 @@
From 3877e1022836017f5eaae9186bc78e284ce1444a Mon Sep 17 00:00:00 2001
From f005d1df8beafdae81ed0f452eae0bf9932da62d Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Fri, 11 Nov 2016 17:28:52 -0800
Subject: [PATCH 2/5] Add arm64 coreos verity hash

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch vendored
View File

@ -1,4 +1,4 @@
From f4aab19e3282905b714246a5792365bad43947a1 Mon Sep 17 00:00:00 2001
From 8ba36ed26f6f40a7e1413448e9d39c97dd336aa7 Mon Sep 17 00:00:00 2001
From: Mohamed Ghannam <simo.ghannam@gmail.com>
Date: Tue, 5 Dec 2017 12:23:04 -0800
Subject: [PATCH 3/5] dccp: CVE-2017-8824: use-after-free in DCCP code

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-factor-out-__blkdev_issue_zero_pages.patch vendored
View File

@ -1,4 +1,4 @@
From 2b4827c1d9f6ba613c2c3b5715174a4dd22b352e Mon Sep 17 00:00:00 2001
From 3cca94dee8d32324b2f218c36e4d96a97d925554 Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <idryomov@gmail.com>
Date: Mon, 16 Oct 2017 15:59:09 +0200
Subject: [PATCH 4/5] block: factor out __blkdev_issue_zero_pages()

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch vendored
View File

@ -1,4 +1,4 @@
From ce6f6a27a873a43067c269e0af2760a2ac0415fc Mon Sep 17 00:00:00 2001
From 52f7e50bdace9340378abb3bb064fcbc0b00d809 Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <idryomov@gmail.com>
Date: Mon, 16 Oct 2017 15:59:10 +0200
Subject: [PATCH 5/5] block: cope with WRITE ZEROES failing in