From 7ee179e5fb9b8cd90d66ae0cfb0ae4369f9ed4db Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Fri, 7 Jan 2022 22:29:06 +0000 Subject: [PATCH] ANDROID: GKI: Disable module signing support from gki_defconfig Device kernels merge gki_defconfig for modules build; forcing them to sign the modules with no certificates from the gki build available causing breakage. GKI module signing support will be enabled via config fragment; so partner builds don't have to disable support in their fragments. Fixes: 9ab6a242258a ("ANDROID: GKI: Add module load time protected symbol lookup") Bug: 200082547 Test: TreeHugger, local builds Signed-off-by: Ramji Jiyani Change-Id: Ia90f0acd57ba9a8795da3f85c2cbe21758f5f4fb --- arch/arm64/configs/gki_defconfig | 2 -- arch/x86/configs/gki_defconfig | 2 -- 2 files changed, 4 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index d5c5ed23294a..460f739437ee 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -100,8 +100,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SCMVERSION=y -CONFIG_MODULE_SIG=y -CONFIG_MODULE_SIG_PROTECT=y CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOPRIO=y CONFIG_BLK_INLINE_ENCRYPTION=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 0e46ce5459ad..bfb97f17d097 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -76,8 +76,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SCMVERSION=y -CONFIG_MODULE_SIG=y -CONFIG_MODULE_SIG_PROTECT=y CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOPRIO=y CONFIG_BLK_INLINE_ENCRYPTION=y