From d76708ad1c17c0d3a118ff00b736e4b3c1539bee Mon Sep 17 00:00:00 2001 From: Liz Prucka Date: Wed, 24 May 2023 09:58:30 -0500 Subject: dashboard/config, tools/syz-kconf: add Cuttlefish support Allow modules in config if `modules` are specified in main.yml. Added Cuttlefish instances for android13-5.10, android13-5.15, and android14-5.15 branches. --- tools/syz-kconf/kconf.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/syz-kconf/kconf.go b/tools/syz-kconf/kconf.go index 9b8c8101d..833ae5d04 100644 --- a/tools/syz-kconf/kconf.go +++ b/tools/syz-kconf/kconf.go @@ -30,6 +30,7 @@ const ( featAppend = "append" featWeak = "weak" featBaseline = "baseline" + featModules = "modules" featReduced = "reduced" featClang = "clang" featAndroid = "android" @@ -197,7 +198,9 @@ func (ctx *Context) generate() error { } } ctx.applyConfigs(cf) - cf.ModToYes() + if !ctx.Inst.Features[featModules] { + cf.ModToYes() + } // Set all configs that are not present (actually not present, rather than "is not set") to "is not set". // This avoids olddefconfig turning on random things we did not ask for. for _, cfg := range ctx.Kconf.Configs { @@ -226,7 +229,9 @@ func (ctx *Context) generate() error { if err := ctx.verifyConfigs(cf); err != nil { return fmt.Errorf("%vsaved config before olddefconfig to %v", err, outputFileTmp) } - cf.ModToNo() + if !ctx.Inst.Features[featModules] { + cf.ModToNo() + } config := []byte(fmt.Sprintf(`# Automatically generated by syz-kconf; DO NOT EDIT. # Kernel: %v %v -- cgit mrf-deployment