tools/out-of-tree
1
0
Fork 0
Code Releases Activity

Now use two separate config for autogenerated and user-defined kernels

Browse Source
This commit is contained in:
dump_stack() 2018-12-01 16:57:15 +00:00
parent 7707f75a02
commit 72aef7545a
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main.go
View File

@ -33,9 +33,13 @@ func main() {
} }
defaultKcfgPath := usr.HomeDir + "/.out-of-tree/kernels.toml" defaultKcfgPath := usr.HomeDir + "/.out-of-tree/kernels.toml"
kcfgPathFlag := app.Flag("kernels", "Path to kernels config") kcfgPathFlag := app.Flag("kernels", "Path to main kernels config")
kcfgPathEnv := kcfgPathFlag.Envar("OUT_OF_TREE_KCFG") kcfgPath := kcfgPathFlag.Default(defaultKcfgPath).ExistingFile()
kcfgPath := kcfgPathEnv.Default(defaultKcfgPath).ExistingFile()
defaultUserKcfgPath := usr.HomeDir + "/.out-of-tree/kernels.user.toml"
userKcfgPathFlag := app.Flag("user-kernels", "User kernels config")
userKcfgPathEnv := userKcfgPathFlag.Envar("OUT_OF_TREE_KCFG")
userKcfgPath := userKcfgPathEnv.Default(defaultUserKcfgPath).String()
qemuTimeoutFlag := app.Flag("qemu-timeout", "Timeout for qemu") qemuTimeoutFlag := app.Flag("qemu-timeout", "Timeout for qemu")
qemuTimeout := qemuTimeoutFlag.Default("1m").Duration() qemuTimeout := qemuTimeoutFlag.Default("1m").Duration()
@ -89,6 +93,15 @@ func main() {
log.Fatalln(err) log.Fatalln(err)
} }
if exists(*userKcfgPath) {
userKcfg, err := config.ReadKernelConfig(*userKcfgPath)
if err != nil {
log.Fatalln(err)
}
kcfg.Kernels = append(kcfg.Kernels, userKcfg.Kernels...)
}
switch kingpin.MustParse(app.Parse(os.Args[1:])) { switch kingpin.MustParse(app.Parse(os.Args[1:])) {
case pewCommand.FullCommand(): case pewCommand.FullCommand():
err = pewHandler(kcfg, *path, *pewKernel, *pewBinary, err = pewHandler(kcfg, *path, *pewKernel, *pewBinary,