From 23c5cc871466520099bda5e999e14b98dd8f44da Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Fri, 7 Jan 2022 16:49:45 -0800 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 Signed-off-by: Will McVicker --- 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 687df26d0b58..8aca9d0b895b 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -93,8 +93,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_INLINE_ENCRYPTION=y CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y CONFIG_IOSCHED_BFQ=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index dd41273648ff..47c7a67c5416 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -75,8 +75,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_INLINE_ENCRYPTION=y CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y CONFIG_IOSCHED_BFQ=y