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

Revert "sys-kernel/coreos-sources: fix vdso32 build for arm"

Browse Source 
This reverts commit 02a187d087c6425345e1b92bc09c1c4276651a4c.

This change is now applied upstream and we no longer need to carry a
separate patch.
This commit is contained in:
Margarita Manterola 2020-09-04 17:39:28 +02:00
parent 178427ca9e
commit 938a2b6fee
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
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}/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}/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch \
${PATCH_DIR}/z0004-add-wireguard-module.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: