diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-10-28 21:32:41 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-10-29 18:02:20 +0100 |
| commit | a0c7169a00e97fc53358f90c9d9c6f8fffddf904 (patch) | |
| tree | a980a4ebb36d73565486e3fb9af7868153f5ac51 /tools/syz-kconf | |
| parent | 36e8b020cd7e97bc2ca3a306f48d4c62ece8fc34 (diff) | |
pkg/kconfig: accept target when parsing Kconfig
Kconfig depends on the target arch.
Add target argument for Kconfig parsing.
Resolve $(SRCARCH) properly (previously we always assumed x86_64).
Diffstat (limited to 'tools/syz-kconf')
| -rw-r--r-- | tools/syz-kconf/kconf.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/syz-kconf/kconf.go b/tools/syz-kconf/kconf.go index 862e4ff45..e4a68998f 100644 --- a/tools/syz-kconf/kconf.go +++ b/tools/syz-kconf/kconf.go @@ -71,10 +71,6 @@ func main() { failf("failed to checkout %v/%v: %v", inst.Kernel.Repo, inst.Kernel.Tag, err) } } - kconf, err := kconfig.Parse(filepath.Join(*flagSourceDir, "Kconfig")) - if err != nil { - fail(err) - } releaseTag, err := repo.ReleaseTag("HEAD") if err != nil { fail(err) @@ -95,7 +91,6 @@ func main() { ConfigDir: filepath.Dir(*flagConfig), SourceDir: *flagSourceDir, ReleaseTag: releaseTag, - Kconf: kconf, } go func() { if err := ctx.generate(); err != nil { @@ -139,6 +134,9 @@ func (ctx *Context) generate() error { if err := ctx.setTarget(); err != nil { return err } + if ctx.Kconf, err = kconfig.Parse(ctx.Target, filepath.Join(ctx.SourceDir, "Kconfig")); err != nil { + return err + } if err := ctx.setReleaseFeatures(); err != nil { return err } |