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

Merge pull request #564 from flatcar-linux/linux-5.4.62-main

Browse Source 
Upgrade Linux Kernel in main from 5.4.61 to 5.4.62
This commit is contained in:
Marga Manterola 2020-09-04 17:55:39 +02:00 committed by GitHub
commit 21bfbeb2e9
5 changed files with 1 additions and 36 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-5.4.61.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.4.62.ebuild vendored
View File

0
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.4.61.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.4.62.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-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
DIST patch-5.4.61.xz 1877088 BLAKE2B 5f94a0d9f78b61c02b4d4bd92beac94728a41ae117f9f0a81b822e91836e4b0c8ff798fad25e45d8192b3958c7a0361cbdccfdadafc03061c79e5457ef361467 SHA512 d200f8e08dd4c8f6431bc69eb1f606ab172222d2749544ae1e6b93bf01485f31d2861d7831d70f661eeb37deebf015a89978a1bb601ea461fb5ac24ba8556ad7
DIST patch-5.4.62.xz 1922432 BLAKE2B 61f2b27d6f0d5d1cbfa65b8e2454077b51d5ba92c4a287765769a239ce1eb78fa59e584e8a4ca3915288aeeb7a51e8697b667c781a2d5aad13a4a6ba5e0ffbd4 SHA512 0d5e2dfeda5c3c57e214dd12209019d0168de7fd43d1a80f78cfb6acd60d186b803296db20b6ac940ee70a265a86821b72f3cbfeedbd52e12ef8e10682885211

1
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.4.61.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.4.62.ebuild vendored
View File

@ -36,5 +36,4 @@ UNIPATCH_LIST="
${PATCH_DIR}/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \
${PATCH_DIR}/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch \
${PATCH_DIR}/z0004-add-wireguard-module.patch \
${PATCH_DIR}/z0005-fix-vdso32-for-arm.patch \
"

34
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.4/z0005-fix-vdso32-for-arm.patch vendored
View File

@ -1,34 +0,0 @@
From: Frank van der Linden <fllinden@amazon.com>
To: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <catalin.marinas@arm.com>,
<will@kernel.org>
Cc: Frank van der Linden <fllinden@amazon.com>
Subject: [PATCH] arm64: vdso32: make vdso32 install conditional
Date: Thu, 27 Aug 2020 23:40:12 +0000
Message-ID: <20200827234012.19757-1-fllinden@amazon.com> (raw)
vdso32 should only be installed if CONFIG_COMPAT_VDSO is enabled,
since it's not even supposed to be compiled otherwise, and arm64
builds without a 32bit crosscompiler will fail.
Signed-off-by: Frank van der Linden <fllinden@amazon.com>
Fixes: 8d75785a8142 ("ARM64: vdso32: Install vdso32 from vdso_install")
Cc: stable@vger.kernel.org [5.4+]
---
arch/arm64/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index b45f0124cc16..100abbb19e0b 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -165,7 +165,8 @@ zinstall install:
PHONY += vdso_install
vdso_install:
$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@
- $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@
+ $(if $(CONFIG_COMPAT_VDSO),$(Q)$(MAKE) \
+ $(build)=arch/arm64/kernel/vdso32 $@)
# We use MRPROPER_FILES and CLEAN_FILES now
archclean: