From 178427ca9e3092fc240716b5f19a4e3f7e36f102 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Fri, 4 Sep 2020 07:23:03 +0000 Subject: [PATCH 1/2] sys-kernel: Upgrade coreos-kernel 5.4.61 to 5.4.62 --- ...{coreos-kernel-5.4.61.ebuild => coreos-kernel-5.4.62.ebuild} | 0 ...oreos-modules-5.4.61.ebuild => coreos-modules-5.4.62.ebuild} | 0 .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 2 +- ...oreos-sources-5.4.61.ebuild => coreos-sources-5.4.62.ebuild} | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-5.4.61.ebuild => coreos-kernel-5.4.62.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-5.4.61.ebuild => coreos-modules-5.4.62.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-5.4.61.ebuild => coreos-sources-5.4.62.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.4.61.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.4.62.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.4.61.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.4.62.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.4.61.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.4.62.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.4.61.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.4.62.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest index 60d294b80c..0f158f506c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.4.61.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.4.62.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.4.61.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.4.62.ebuild From 938a2b6fee2c85081661d64b3cda3f7fa5175f3d Mon Sep 17 00:00:00 2001 From: Margarita Manterola Date: Fri, 4 Sep 2020 17:39:28 +0200 Subject: [PATCH 2/2] Revert "sys-kernel/coreos-sources: fix vdso32 build for arm" This reverts commit 02a187d087c6425345e1b92bc09c1c4276651a4c. This change is now applied upstream and we no longer need to carry a separate patch. --- .../coreos-sources-5.4.62.ebuild | 1 - .../files/5.4/z0005-fix-vdso32-for-arm.patch | 34 ------------------- 2 files changed, 35 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.4/z0005-fix-vdso32-for-arm.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.4.62.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.4.62.ebuild index 9ffa0e86a6..e626e6b53f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.4.62.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.4.62.ebuild @@ -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 \ " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.4/z0005-fix-vdso32-for-arm.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.4/z0005-fix-vdso32-for-arm.patch deleted file mode 100644 index f3973ae7f0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.4/z0005-fix-vdso32-for-arm.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Frank van der Linden -To: , - , , - -Cc: Frank van der Linden -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 -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: