diff options
author | Vladimir Serbinenko <phcoder@gmail.com> | 2015-05-29 20:49:09 +0200 |
---|---|---|
committer | Vladimir Serbinenko <phcoder@gmail.com> | 2015-05-30 13:51:53 +0200 |
commit | 39e25eceaf054fc70086b178d0d1f34def4cbf2b (patch) | |
tree | 9b86c58ceb6c90e320ea0740efae7711427c38f9 | |
parent | a78f69980719d4de5ec5fe24e1d4840d18bf40fc (diff) |
autoport: Allow binary prerequisites to be placed in the autoport directory.
This allow an easy creation of standalone "autoport pack".
Change-Id: Ibe9e38aa3b4bbd7260104e1c2a11630790ff4d2f
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/10370
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <edward.ocallaghan@koparo.com>
-rw-r--r-- | util/autoport/log_maker.go | 22 | ||||
-rw-r--r-- | util/autoport/readme.md | 7 |
2 files changed, 26 insertions, 3 deletions
diff --git a/util/autoport/log_maker.go b/util/autoport/log_maker.go index b991ea715d..e2440b4891 100644 --- a/util/autoport/log_maker.go +++ b/util/autoport/log_maker.go @@ -9,7 +9,7 @@ import ( "strings" ) -func RunAndSave(output string, name string, arg ...string) { +func TryRunAndSave(output string, name string, arg []string) error { cmd := exec.Command(name, arg...) f, err := os.Create(output) @@ -22,9 +22,27 @@ func RunAndSave(output string, name string, arg ...string) { err = cmd.Start() if err != nil { - log.Fatal(err) + return err } cmd.Wait() + return nil +} + +func RunAndSave(output string, name string, arg ...string) { + err := TryRunAndSave(output, name, arg) + if err == nil { + return + } + idx := strings.LastIndex(name, "/") + relname := name + if idx >= 0 { + relname = name[idx+1:] + } + relname = "./" + relname + err = TryRunAndSave(output, relname, arg) + if err != nil { + log.Fatal(err) + } } func MakeLogs(outDir string) { diff --git a/util/autoport/readme.md b/util/autoport/readme.md index e5ea77d12c..158cf49fdf 100644 --- a/util/autoport/readme.md +++ b/util/autoport/readme.md @@ -25,7 +25,12 @@ This will allow autoport to detect as much as possible make cd ../autoport go build - ./autoport --input_log=logs --make_logs --coreboot_dir=../.. + sudo ./autoport --input_log=logs --make_logs --coreboot_dir=../.. + + Note: in case you have problems getting gcc and golang to target machine + you can just compile on another machine and transfer binaries + `autoport`, `inteltool` and `ectool`. You'll still need other prerequisites + but you may place them in the same directory as autoport. * Look for output unknown PCI devices. E.g. |