diff --git a/device/testing/linux-google-nyan/APKBUILD b/device/testing/linux-google-nyan/APKBUILD index e10b6b241..5cd98b813 100644 --- a/device/testing/linux-google-nyan/APKBUILD +++ b/device/testing/linux-google-nyan/APKBUILD @@ -2,7 +2,7 @@ # Co-Maintainer: Segfault pkgname=linux-google-nyan pkgver=5.18.5 -pkgrel=0 +pkgrel=1 pkgdesc="Mainline kernel fork for Google Nyan Chromebooks" arch="armv7" _carch="arm" @@ -11,11 +11,7 @@ url="https://kernel.org" license="GPL-2.0-only" options="!strip !check !tracedeps pmb:cross-native - pmb:kconfigcheck-waydroid - pmb:kconfigcheck-containers - pmb:kconfigcheck-iwd - pmb:kconfigcheck-nftables - pmb:kconfigcheck-zram + pmb:kconfigcheck-community " makedepends=" bison @@ -72,7 +68,7 @@ package() { sha512sums=" 1872e2cf8cdd6e0033ce69f26f25526a30c237d220c02b20829fca31d6068fb816de2f2e5fd41f6807648cef8f28ddda392b199c7b1c3b48b2460c840fa1e150 linux-5.18.5.tar.xz -ef6b65a2aa9652b23a70092c4c76ffeb43ae2f3d8a285dcf142a964786efd44da3372692c892559f063afa2267e438c1dc681b9c034a30fde1fe09bd91822cf9 config-google-nyan.armv7 +59f4d39d6e817df6b56ef1429b45da77fe714c3ff286889b145e6f65811a29cd8f7d480ebf1c72f780890f45e2ba112f3bb10c90e002324ed5e6b0b6b04b8af6 config-google-nyan.armv7 2367c64676e4329739e8cc8f874553981747c1bdea833871e2eefe649854fb5908ca0cff5ad11d07e095737632ee71a2f6010bf438a1a60414d7572800b4a07b 0001-disable-spectre-log-spam.patch be21d145f39d334e37f8dd79b78474c072e54502ba5c9ae63163f0ce30ffaa3a3448b05d153205ba8af7a761952ecddb3ae1a5b348902b4ce5f4f72138937fdb 0002-ARM-dts-tegra-nyan-add-mmc-aliases.patch 4ec3bc3bce229ba664ad98251dbcad9d224a3792d3149cc64b5a1eee0801f1a366b83447b55a02cb0915bd3ef63f42260dd55a286f68c727fcfc4d46bba4363a 0003-ARM-tegra-nyan-fix-mic-jack-detection.patch diff --git a/device/testing/linux-google-nyan/config-google-nyan.armv7 b/device/testing/linux-google-nyan/config-google-nyan.armv7 index 0393785ab..59e6f53a7 100644 --- a/device/testing/linux-google-nyan/config-google-nyan.armv7 +++ b/device/testing/linux-google-nyan/config-google-nyan.armv7 @@ -2,14 +2,14 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm 5.18.5 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219" +CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 12.2.1_git20220924-r5) 12.2.1 20220924" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=110201 +CONFIG_GCC_VERSION=120201 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23800 +CONFIG_AS_VERSION=23900 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23800 +CONFIG_LD_VERSION=23900 CONFIG_LLD_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y @@ -476,6 +476,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_PARAVIRT is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set # CONFIG_XEN is not set +CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y CONFIG_STACKPROTECTOR_PER_TASK=y # end of Kernel Features @@ -706,7 +707,6 @@ CONFIG_HAVE_GCC_PLUGINS=y CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set -CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y # end of General architecture-dependent options CONFIG_RT_MUTEXES=y @@ -982,7 +982,7 @@ CONFIG_NETFILTER_FAMILY_BRIDGE=y # CONFIG_NETFILTER_NETLINK_OSF is not set CONFIG_NF_CONNTRACK=m # CONFIG_NF_LOG_SYSLOG is not set -# CONFIG_NF_CONNTRACK_MARK is not set +CONFIG_NF_CONNTRACK_MARK=y # CONFIG_NF_CONNTRACK_ZONES is not set CONFIG_NF_CONNTRACK_PROCFS=y # CONFIG_NF_CONNTRACK_EVENTS is not set @@ -1026,6 +1026,8 @@ CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT_INET=m # CONFIG_NFT_COMPAT is not set # CONFIG_NFT_HASH is not set +CONFIG_NFT_FIB=m +# CONFIG_NFT_FIB_INET is not set # CONFIG_NFT_XFRM is not set # CONFIG_NFT_SOCKET is not set # CONFIG_NFT_OSF is not set @@ -1063,7 +1065,7 @@ CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m # CONFIG_NETFILTER_XT_TARGET_TEE is not set # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set -# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set # @@ -1112,7 +1114,7 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=m # CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set # CONFIG_NETFILTER_XT_MATCH_STRING is not set -# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m # CONFIG_NETFILTER_XT_MATCH_TIME is not set # CONFIG_NETFILTER_XT_MATCH_U32 is not set # end of Core Netfilter Configuration @@ -1175,7 +1177,7 @@ CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_TABLES_IPV4=y CONFIG_NFT_REJECT_IPV4=m # CONFIG_NFT_DUP_IPV4 is not set -# CONFIG_NFT_FIB_IPV4 is not set +CONFIG_NFT_FIB_IPV4=m # CONFIG_NF_TABLES_ARP is not set # CONFIG_NF_DUP_IPV4 is not set # CONFIG_NF_LOG_ARP is not set @@ -1210,7 +1212,7 @@ CONFIG_IP_NF_MANGLE=m CONFIG_NF_TABLES_IPV6=y CONFIG_NFT_REJECT_IPV6=m # CONFIG_NFT_DUP_IPV6 is not set -# CONFIG_NFT_FIB_IPV6 is not set +CONFIG_NFT_FIB_IPV6=m # CONFIG_NF_DUP_IPV6 is not set CONFIG_NF_REJECT_IPV6=m # CONFIG_NF_LOG_IPV6 is not set @@ -1952,7 +1954,7 @@ CONFIG_ZRAM_DEF_COMP="lzo-rle" CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_DRBD is not set -# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set @@ -7505,10 +7507,11 @@ CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux, # # Memory initialization # +CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y CONFIG_INIT_STACK_NONE=y -# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set +# CONFIG_INIT_STACK_ALL_PATTERN is not set +# CONFIG_INIT_STACK_ALL_ZERO is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y