diff options
| author | Andrew Donnellan <andrew.donnellan@au1.ibm.com> | 2019-03-29 17:22:11 +1100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-05-03 10:00:16 +0200 |
| commit | 0642ca0c5c781f144cabb6e4b811a6714d5eed51 (patch) | |
| tree | 76152585a1eb92de7a404e448dfe33b4b8682c74 /pkg | |
| parent | bfc19a4b19ceba8f9f03d3cde255cd5b1273c650 (diff) | |
pkg/build: Call Linux image creation script with target arch argument
Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/linux.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkg/build/linux.go b/pkg/build/linux.go index bdfa0edd2..e3c8a6d9f 100644 --- a/pkg/build/linux.go +++ b/pkg/build/linux.go @@ -28,7 +28,8 @@ func (linux linux) build(targetArch, vmType, kernelDir, outputDir, compiler, use if err := linux.buildKernel(kernelDir, outputDir, compiler, config); err != nil { return err } - if err := linux.createImage(vmType, kernelDir, outputDir, userspaceDir, cmdlineFile, sysctlFile); err != nil { + if err := linux.createImage(targetArch, vmType, kernelDir, outputDir, userspaceDir, cmdlineFile, + sysctlFile); err != nil { return err } return nil @@ -76,7 +77,7 @@ func (linux) buildKernel(kernelDir, outputDir, compiler string, config []byte) e return nil } -func (linux) createImage(vmType, kernelDir, outputDir, userspaceDir, cmdlineFile, sysctlFile string) error { +func (linux) createImage(targetArch, vmType, kernelDir, outputDir, userspaceDir, cmdlineFile, sysctlFile string) error { tempDir, err := ioutil.TempDir("", "syz-build") if err != nil { return err @@ -87,7 +88,7 @@ func (linux) createImage(vmType, kernelDir, outputDir, userspaceDir, cmdlineFile return fmt.Errorf("failed to write script file: %v", err) } bzImage := filepath.Join(kernelDir, filepath.FromSlash("arch/x86/boot/bzImage")) - cmd := osutil.Command(scriptFile, userspaceDir, bzImage) + cmd := osutil.Command(scriptFile, userspaceDir, bzImage, targetArch) cmd.Dir = tempDir cmd.Env = append([]string{}, os.Environ()...) cmd.Env = append(cmd.Env, |