pkg/build: Call Linux image creation script with target arch argument
Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
diff --git a/pkg/build/linux.go b/pkg/build/linux.go
index bdfa0ed..e3c8a6d 100644
--- a/pkg/build/linux.go
+++ b/pkg/build/linux.go
@@ -28,7 +28,8 @@
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 @@
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 @@
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,
