From dcfaa6acc2f237f24e9b7f5b2d018ad464b1a412 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 7 Jun 2022 19:40:27 +0200 Subject: [PATCH] community/linux-asus-me176c: fix build by updating kernel config Run "pmbootstrap kconfig migrate asus-me176c" to update the kernel config for the new Linux version. Otherwise there is an interactive prompt that times out on BPO (although it succeeds on GitLab CI for some strange reason). --- device/community/linux-asus-me176c/APKBUILD | 2 +- .../config-asus-me176c.x86_64 | 23 ++++++------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/device/community/linux-asus-me176c/APKBUILD b/device/community/linux-asus-me176c/APKBUILD index 51dc8a1cc..778973529 100644 --- a/device/community/linux-asus-me176c/APKBUILD +++ b/device/community/linux-asus-me176c/APKBUILD @@ -66,5 +66,5 @@ sha512sums=" 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f linux-5.4.tar.xz 74d40207bec5273988759660cee5d5ed4fdd993ca92027a726d4d4f45a23c2c86f4a42fc060af8bcf2a367cab8c17f19eccb85c7f473e11bae6c5cac405c32dc linux-5.4.197.patch.xz aa462bfcbba87469a617e2ffd4058cd41137b74f836aae47ac89bc70de2836b8f3ddce94f597e61bb287eb009bb71f4e831c487b0073011673d5db4a8d8ae080 linux-me176c-5.4.17.patch.xz -56d565703da993f1908948b2232e42625783c18ef3e7053f71e3c808e98d35a472c27b32b7afcd91838b5ac6850bf6284d4c3bd7017e2964b80f4d9617952807 config-asus-me176c.x86_64 +c4ad6bfb37990a51ee83b8791bc6f9fb47ccd566de0282deb595a00d9a4787e13e1a01810212a966e3e8090c61bd513869af346704b8c2f22c7bbeea5e8eada4 config-asus-me176c.x86_64 " diff --git a/device/community/linux-asus-me176c/config-asus-me176c.x86_64 b/device/community/linux-asus-me176c/config-asus-me176c.x86_64 index 08b2b06a0..0614a3056 100644 --- a/device/community/linux-asus-me176c/config-asus-me176c.x86_64 +++ b/device/community/linux-asus-me176c/config-asus-me176c.x86_64 @@ -1,13 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.4.159 Kernel Configuration +# Linux/x86_64 5.4.197 Kernel Configuration # # -# Compiler: gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027 +# Compiler: gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100301 +CONFIG_GCC_VERSION=110201 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y @@ -233,6 +233,7 @@ CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT_ALWAYS_ON=y +# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_RSEQ=y @@ -782,12 +783,8 @@ CONFIG_ARCH_HAS_MEM_ENCRYPT=y CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling -CONFIG_PLUGIN_HOSTCC="g++" +CONFIG_PLUGIN_HOSTCC="" CONFIG_HAVE_GCC_PLUGINS=y -CONFIG_GCC_PLUGINS=y -# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set -# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set -# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set # end of General architecture-dependent options CONFIG_RT_MUTEXES=y @@ -2038,6 +2035,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_ZRAM=m @@ -2653,7 +2651,6 @@ CONFIG_IEEE802154_HWSIM=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -# CONFIG_NVM is not set # # Input device support @@ -6500,17 +6497,11 @@ CONFIG_LSM="yama" # # Kernel hardening options # -CONFIG_GCC_PLUGIN_STRUCTLEAK=y # # Memory initialization # -# CONFIG_INIT_STACK_NONE is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set -CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y -# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set -# CONFIG_GCC_PLUGIN_STACKLEAK is not set +CONFIG_INIT_STACK_NONE=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # end of Memory initialization