mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 17:26:28 +00:00
Merge pull request #3951 from deitch/proper-efi-arch
pass target arch to final image builder as TARGETARCH; use TARGETARCH…
This commit is contained in:
commit
5d78de48f7
@ -204,7 +204,7 @@ The generated image can be in one of multiple formats which can be run on variou
|
|||||||
}
|
}
|
||||||
|
|
||||||
log.Infof("Create outputs:")
|
log.Infof("Create outputs:")
|
||||||
err = moby.Formats(filepath.Join(dir, name), image, buildFormats, size, cacheDir.String())
|
err = moby.Formats(filepath.Join(dir, name), image, buildFormats, size, arch, cacheDir.String())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error writing outputs: %v", err)
|
return fmt.Errorf("Error writing outputs: %v", err)
|
||||||
}
|
}
|
||||||
|
@ -15,8 +15,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// dockerRun is outside the linuxkit/docker package, because that is for caching, this is
|
// dockerRun is outside the linuxkit/docker package, because that is for caching, this is
|
||||||
// used for running to build images.
|
// used for running to build images. runEnv is passed through to the docker run command.
|
||||||
func dockerRun(input io.Reader, output io.Writer, img string, args ...string) error {
|
func dockerRun(input io.Reader, output io.Writer, img string, runEnv []string, args ...string) error {
|
||||||
log.Debugf("docker run %s (input): %s", img, strings.Join(args, " "))
|
log.Debugf("docker run %s (input): %s", img, strings.Join(args, " "))
|
||||||
docker, err := exec.LookPath("docker")
|
docker, err := exec.LookPath("docker")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -36,7 +36,12 @@ func dockerRun(input io.Reader, output io.Writer, img string, args ...string) er
|
|||||||
}
|
}
|
||||||
|
|
||||||
var errbuf strings.Builder
|
var errbuf strings.Builder
|
||||||
args = append([]string{"run", "--network=none", "--log-driver=none", "--rm", "-i", img}, args...)
|
args = []string{"run", "--network=none", "--log-driver=none", "--rm", "-i"}
|
||||||
|
for _, e := range runEnv {
|
||||||
|
args = append(args, "-e", e)
|
||||||
|
}
|
||||||
|
|
||||||
|
args = append(args, img)
|
||||||
cmd := exec.Command(docker, args...)
|
cmd := exec.Command(docker, args...)
|
||||||
cmd.Stderr = &errbuf
|
cmd.Stderr = &errbuf
|
||||||
cmd.Stdin = input
|
cmd.Stdin = input
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
iso: linuxkit/mkimage-iso:1f6fdf0ee860caf13c06a6f3f2d89413de78881e
|
iso: linuxkit/mkimage-iso:1f6fdf0ee860caf13c06a6f3f2d89413de78881e
|
||||||
iso-bios: linuxkit/mkimage-iso-bios:314c06ec0d72f12057c9e8d5fdf790df02dbc8c2
|
iso-bios: linuxkit/mkimage-iso-bios:314c06ec0d72f12057c9e8d5fdf790df02dbc8c2
|
||||||
iso-efi: linuxkit/mkimage-iso-efi:b74d215d594ccdf7d51fa412518b2f895aa7f9dc
|
iso-efi: linuxkit/mkimage-iso-efi:55b72b55ffea82d1c254c0ff5cb65df0c2c04528
|
||||||
iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:0e66171ffde9bb735b0e014f811f9626fc8b9bc9
|
iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:f7fba1acaee8afbea2771717c9faf758d0a66a87
|
||||||
raw-bios: linuxkit/mkimage-raw-bios:6185592a62b860b01491d7f1661e79f62e6fc902
|
raw-bios: linuxkit/mkimage-raw-bios:6185592a62b860b01491d7f1661e79f62e6fc902
|
||||||
raw-efi: linuxkit/mkimage-raw-efi:6dff9623fb4fecff05ca02123aa8bc345ab7c707
|
raw-efi: linuxkit/mkimage-raw-efi:6a8d9ebf4f7883839e00034c1516527452c564d3
|
||||||
squashfs: linuxkit/mkimage-squashfs:92dbcfe5ef69dc93276403b09a9f892f25654ed7
|
squashfs: linuxkit/mkimage-squashfs:92dbcfe5ef69dc93276403b09a9f892f25654ed7
|
||||||
gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098
|
gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098
|
||||||
qcow2-efi: linuxkit/mkimage-qcow2-efi:67d5e16228dfb434ac5418bafac720bf23bbaf42
|
qcow2-efi: linuxkit/mkimage-qcow2-efi:19cb758d47c07169bc4772a7576e28d56740b004
|
||||||
vhd: linuxkit/mkimage-vhd:91bcc7a6475f46a3d5d84cf6161f07c583dd9c21
|
vhd: linuxkit/mkimage-vhd:91bcc7a6475f46a3d5d84cf6161f07c583dd9c21
|
||||||
dynamic-vhd: linuxkit/mkimage-dynamic-vhd:b755f8ff82c8631d18decaebb09867e7b88c2533
|
dynamic-vhd: linuxkit/mkimage-dynamic-vhd:b755f8ff82c8631d18decaebb09867e7b88c2533
|
||||||
vmdk: linuxkit/mkimage-vmdk:20a370a55bd8d58c2ae9d634c297a955bb006efd
|
vmdk: linuxkit/mkimage-vmdk:20a370a55bd8d58c2ae9d634c297a955bb006efd
|
||||||
|
@ -15,6 +15,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/linuxkit/linuxkit/src/cmd/linuxkit/initrd"
|
"github.com/linuxkit/linuxkit/src/cmd/linuxkit/initrd"
|
||||||
|
"github.com/linuxkit/linuxkit/src/cmd/linuxkit/util"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"gopkg.in/yaml.v2"
|
"gopkg.in/yaml.v2"
|
||||||
)
|
)
|
||||||
@ -23,8 +24,8 @@ import (
|
|||||||
var imagesBytes []byte
|
var imagesBytes []byte
|
||||||
var outputImages map[string]string
|
var outputImages map[string]string
|
||||||
|
|
||||||
var outFuns = map[string]func(string, io.Reader, int) error{
|
var outFuns = map[string]func(base string, ir io.Reader, size int, arch string) error{
|
||||||
"kernel+initrd": func(base string, image io.Reader, size int) error {
|
"kernel+initrd": func(base string, image io.Reader, size int, arch string) error {
|
||||||
kernel, initrd, cmdline, ucode, err := tarToInitrd(image)
|
kernel, initrd, cmdline, ucode, err := tarToInitrd(image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error converting to initrd: %v", err)
|
return fmt.Errorf("Error converting to initrd: %v", err)
|
||||||
@ -35,7 +36,7 @@ var outFuns = map[string]func(string, io.Reader, int) error{
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"tar-kernel-initrd": func(base string, image io.Reader, size int) error {
|
"tar-kernel-initrd": func(base string, image io.Reader, size int, arch string) error {
|
||||||
kernel, initrd, cmdline, ucode, err := tarToInitrd(image)
|
kernel, initrd, cmdline, ucode, err := tarToInitrd(image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error converting to initrd: %v", err)
|
return fmt.Errorf("Error converting to initrd: %v", err)
|
||||||
@ -45,70 +46,70 @@ var outFuns = map[string]func(string, io.Reader, int) error{
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"iso-bios": func(base string, image io.Reader, size int) error {
|
"iso-bios": func(base string, image io.Reader, size int, arch string) error {
|
||||||
err := outputIso(outputImages["iso-bios"], base+".iso", image)
|
err := outputIso(outputImages["iso-bios"], base+".iso", image, arch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error writing iso-bios output: %v", err)
|
return fmt.Errorf("Error writing iso-bios output: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"iso-efi": func(base string, image io.Reader, size int) error {
|
"iso-efi": func(base string, image io.Reader, size int, arch string) error {
|
||||||
err := outputIso(outputImages["iso-efi"], base+"-efi.iso", image)
|
err := outputIso(outputImages["iso-efi"], base+"-efi.iso", image, arch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error writing iso-efi output: %v", err)
|
return fmt.Errorf("Error writing iso-efi output: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"iso-efi-initrd": func(base string, image io.Reader, size int) error {
|
"iso-efi-initrd": func(base string, image io.Reader, size int, arch string) error {
|
||||||
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error converting to initrd: %v", err)
|
return fmt.Errorf("Error converting to initrd: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = outputImg(outputImages["iso-efi-initrd"], base+"-efi-initrd.iso", kernel, initrd, cmdline)
|
err = outputImg(outputImages["iso-efi-initrd"], base+"-efi-initrd.iso", kernel, initrd, cmdline, arch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error writing iso-efi-initrd output: %v", err)
|
return fmt.Errorf("Error writing iso-efi-initrd output: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"raw-bios": func(base string, image io.Reader, size int) error {
|
"raw-bios": func(base string, image io.Reader, size int, arch string) error {
|
||||||
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error converting to initrd: %v", err)
|
return fmt.Errorf("Error converting to initrd: %v", err)
|
||||||
}
|
}
|
||||||
// TODO: Handle ucode
|
// TODO: Handle ucode
|
||||||
err = outputImg(outputImages["raw-bios"], base+"-bios.img", kernel, initrd, cmdline)
|
err = outputImg(outputImages["raw-bios"], base+"-bios.img", kernel, initrd, cmdline, arch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error writing raw-bios output: %v", err)
|
return fmt.Errorf("Error writing raw-bios output: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"raw-efi": func(base string, image io.Reader, size int) error {
|
"raw-efi": func(base string, image io.Reader, size int, arch string) error {
|
||||||
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error converting to initrd: %v", err)
|
return fmt.Errorf("Error converting to initrd: %v", err)
|
||||||
}
|
}
|
||||||
err = outputImg(outputImages["raw-efi"], base+"-efi.img", kernel, initrd, cmdline)
|
err = outputImg(outputImages["raw-efi"], base+"-efi.img", kernel, initrd, cmdline, arch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error writing raw-efi output: %v", err)
|
return fmt.Errorf("Error writing raw-efi output: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"kernel+squashfs": func(base string, image io.Reader, size int) error {
|
"kernel+squashfs": func(base string, image io.Reader, size int, arch string) error {
|
||||||
err := outputKernelSquashFS(outputImages["squashfs"], base, image)
|
err := outputKernelSquashFS(outputImages["squashfs"], base, image, arch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error writing kernel+squashfs output: %v", err)
|
return fmt.Errorf("Error writing kernel+squashfs output: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"kernel+iso": func(base string, image io.Reader, size int) error {
|
"kernel+iso": func(base string, image io.Reader, size int, arch string) error {
|
||||||
err := outputKernelISO(outputImages["iso"], base, image)
|
err := outputKernelISO(outputImages["iso"], base, image, arch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error writing kernel+iso output: %v", err)
|
return fmt.Errorf("Error writing kernel+iso output: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"aws": func(base string, image io.Reader, size int) error {
|
"aws": func(base string, image io.Reader, size int, arch string) error {
|
||||||
filename := base + ".raw"
|
filename := base + ".raw"
|
||||||
log.Infof(" %s", filename)
|
log.Infof(" %s", filename)
|
||||||
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
||||||
@ -121,29 +122,29 @@ var outFuns = map[string]func(string, io.Reader, int) error{
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"gcp": func(base string, image io.Reader, size int) error {
|
"gcp": func(base string, image io.Reader, size int, arch string) error {
|
||||||
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error converting to initrd: %v", err)
|
return fmt.Errorf("Error converting to initrd: %v", err)
|
||||||
}
|
}
|
||||||
err = outputImg(outputImages["gcp"], base+".img.tar.gz", kernel, initrd, cmdline)
|
err = outputImg(outputImages["gcp"], base+".img.tar.gz", kernel, initrd, cmdline, arch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error writing gcp output: %v", err)
|
return fmt.Errorf("Error writing gcp output: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"qcow2-efi": func(base string, image io.Reader, size int) error {
|
"qcow2-efi": func(base string, image io.Reader, size int, arch string) error {
|
||||||
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error converting to initrd: %v", err)
|
return fmt.Errorf("Error converting to initrd: %v", err)
|
||||||
}
|
}
|
||||||
err = outputImg(outputImages["qcow2-efi"], base+"-efi.qcow2", kernel, initrd, cmdline)
|
err = outputImg(outputImages["qcow2-efi"], base+"-efi.qcow2", kernel, initrd, cmdline, arch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error writing qcow2 EFI output: %v", err)
|
return fmt.Errorf("Error writing qcow2 EFI output: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"qcow2-bios": func(base string, image io.Reader, size int) error {
|
"qcow2-bios": func(base string, image io.Reader, size int, arch string) error {
|
||||||
filename := base + ".qcow2"
|
filename := base + ".qcow2"
|
||||||
log.Infof(" %s", filename)
|
log.Infof(" %s", filename)
|
||||||
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
||||||
@ -157,40 +158,40 @@ var outFuns = map[string]func(string, io.Reader, int) error{
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"vhd": func(base string, image io.Reader, size int) error {
|
"vhd": func(base string, image io.Reader, size int, arch string) error {
|
||||||
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error converting to initrd: %v", err)
|
return fmt.Errorf("Error converting to initrd: %v", err)
|
||||||
}
|
}
|
||||||
err = outputImg(outputImages["vhd"], base+".vhd", kernel, initrd, cmdline)
|
err = outputImg(outputImages["vhd"], base+".vhd", kernel, initrd, cmdline, arch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error writing vhd output: %v", err)
|
return fmt.Errorf("Error writing vhd output: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"dynamic-vhd": func(base string, image io.Reader, size int) error {
|
"dynamic-vhd": func(base string, image io.Reader, size int, arch string) error {
|
||||||
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error converting to initrd: %v", err)
|
return fmt.Errorf("Error converting to initrd: %v", err)
|
||||||
}
|
}
|
||||||
err = outputImg(outputImages["dynamic-vhd"], base+".vhd", kernel, initrd, cmdline)
|
err = outputImg(outputImages["dynamic-vhd"], base+".vhd", kernel, initrd, cmdline, arch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error writing vhd output: %v", err)
|
return fmt.Errorf("Error writing vhd output: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"vmdk": func(base string, image io.Reader, size int) error {
|
"vmdk": func(base string, image io.Reader, size int, arch string) error {
|
||||||
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
kernel, initrd, cmdline, _, err := tarToInitrd(image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error converting to initrd: %v", err)
|
return fmt.Errorf("Error converting to initrd: %v", err)
|
||||||
}
|
}
|
||||||
err = outputImg(outputImages["vmdk"], base+".vmdk", kernel, initrd, cmdline)
|
err = outputImg(outputImages["vmdk"], base+".vmdk", kernel, initrd, cmdline, arch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error writing vmdk output: %v", err)
|
return fmt.Errorf("Error writing vmdk output: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
"rpi3": func(base string, image io.Reader, size int) error {
|
"rpi3": func(base string, image io.Reader, size int, arch string) error {
|
||||||
if runtime.GOARCH != "arm64" {
|
if runtime.GOARCH != "arm64" {
|
||||||
return fmt.Errorf("Raspberry Pi output currently only supported on arm64")
|
return fmt.Errorf("Raspberry Pi output currently only supported on arm64")
|
||||||
}
|
}
|
||||||
@ -251,7 +252,7 @@ func ValidateFormats(formats []string, cache string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Formats generates all the specified output formats
|
// Formats generates all the specified output formats
|
||||||
func Formats(base string, image string, formats []string, size int, cache string) error {
|
func Formats(base string, image string, formats []string, size int, arch, cache string) error {
|
||||||
log.Debugf("format: %v %s", formats, base)
|
log.Debugf("format: %v %s", formats, base)
|
||||||
|
|
||||||
err := ValidateFormats(formats, cache)
|
err := ValidateFormats(formats, cache)
|
||||||
@ -265,7 +266,7 @@ func Formats(base string, image string, formats []string, size int, cache string
|
|||||||
}
|
}
|
||||||
defer ir.Close()
|
defer ir.Close()
|
||||||
f := outFuns[o]
|
f := outFuns[o]
|
||||||
if err := f(base, ir, size); err != nil {
|
if err := f(base, ir, size, arch); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -336,7 +337,7 @@ func tarInitrdKernel(kernel, initrd []byte, cmdline string) (*bytes.Buffer, erro
|
|||||||
return buf, tw.Close()
|
return buf, tw.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
func outputImg(image, filename string, kernel []byte, initrd []byte, cmdline string) error {
|
func outputImg(image, filename string, kernel []byte, initrd []byte, cmdline, arch string) error {
|
||||||
log.Debugf("output img: %s %s", image, filename)
|
log.Debugf("output img: %s %s", image, filename)
|
||||||
log.Infof(" %s", filename)
|
log.Infof(" %s", filename)
|
||||||
buf, err := tarInitrdKernel(kernel, initrd, cmdline)
|
buf, err := tarInitrdKernel(kernel, initrd, cmdline)
|
||||||
@ -348,10 +349,14 @@ func outputImg(image, filename string, kernel []byte, initrd []byte, cmdline str
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer output.Close()
|
defer output.Close()
|
||||||
return dockerRun(buf, output, image, cmdline)
|
march, err := util.MArch(arch)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return dockerRun(buf, output, image, []string{fmt.Sprintf("TARGETARCH=%s", march)}, cmdline)
|
||||||
}
|
}
|
||||||
|
|
||||||
func outputIso(image, filename string, filesystem io.Reader) error {
|
func outputIso(image, filename string, filesystem io.Reader, arch string) error {
|
||||||
log.Debugf("output ISO: %s %s", image, filename)
|
log.Debugf("output ISO: %s %s", image, filename)
|
||||||
log.Infof(" %s", filename)
|
log.Infof(" %s", filename)
|
||||||
output, err := os.Create(filename)
|
output, err := os.Create(filename)
|
||||||
@ -359,7 +364,11 @@ func outputIso(image, filename string, filesystem io.Reader) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer output.Close()
|
defer output.Close()
|
||||||
return dockerRun(filesystem, output, image)
|
march, err := util.MArch(arch)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return dockerRun(filesystem, output, image, []string{fmt.Sprintf("TARGETARCH=%s", march)})
|
||||||
}
|
}
|
||||||
|
|
||||||
func outputRPi3(image, filename string, filesystem io.Reader) error {
|
func outputRPi3(image, filename string, filesystem io.Reader) error {
|
||||||
@ -370,7 +379,7 @@ func outputRPi3(image, filename string, filesystem io.Reader) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer output.Close()
|
defer output.Close()
|
||||||
return dockerRun(filesystem, output, image)
|
return dockerRun(filesystem, output, image, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
func outputKernelInitrd(base string, kernel []byte, initrd []byte, cmdline string, ucode []byte) error {
|
func outputKernelInitrd(base string, kernel []byte, initrd []byte, cmdline string, ucode []byte) error {
|
||||||
@ -482,7 +491,7 @@ func outputKernelInitrdTarball(base string, kernel []byte, initrd []byte, cmdlin
|
|||||||
return tw.Close()
|
return tw.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
func outputKernelSquashFS(image, base string, filesystem io.Reader) error {
|
func outputKernelSquashFS(image, base string, filesystem io.Reader, arch string) error {
|
||||||
log.Debugf("output kernel/squashfs: %s %s", image, base)
|
log.Debugf("output kernel/squashfs: %s %s", image, base)
|
||||||
log.Infof(" %s-squashfs.img", base)
|
log.Infof(" %s-squashfs.img", base)
|
||||||
|
|
||||||
@ -534,10 +543,14 @@ func outputKernelSquashFS(image, base string, filesystem io.Reader) error {
|
|||||||
}
|
}
|
||||||
defer output.Close()
|
defer output.Close()
|
||||||
|
|
||||||
return dockerRun(buf, output, image)
|
march, err := util.MArch(arch)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return dockerRun(buf, output, image, []string{fmt.Sprintf("TARGETARCH=%s", march)})
|
||||||
}
|
}
|
||||||
|
|
||||||
func outputKernelISO(image, base string, filesystem io.Reader) error {
|
func outputKernelISO(image, base string, filesystem io.Reader, arch string) error {
|
||||||
log.Debugf("output kernel/iso: %s %s", image, base)
|
log.Debugf("output kernel/iso: %s %s", image, base)
|
||||||
log.Infof(" %s.iso", base)
|
log.Infof(" %s.iso", base)
|
||||||
|
|
||||||
@ -589,5 +602,9 @@ func outputKernelISO(image, base string, filesystem io.Reader) error {
|
|||||||
}
|
}
|
||||||
defer output.Close()
|
defer output.Close()
|
||||||
|
|
||||||
return dockerRun(buf, output, image)
|
march, err := util.MArch(arch)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return dockerRun(buf, output, image, []string{fmt.Sprintf("TARGETARCH=%s", march)})
|
||||||
}
|
}
|
||||||
|
25
src/cmd/linuxkit/util/arch.go
Normal file
25
src/cmd/linuxkit/util/arch.go
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
package util
|
||||||
|
|
||||||
|
import "fmt"
|
||||||
|
|
||||||
|
// MArch turn an input arch into a canonical arch as given by `uname -m`
|
||||||
|
func MArch(in string) (string, error) {
|
||||||
|
switch in {
|
||||||
|
case "x86_64", "amd64":
|
||||||
|
return "x86_64", nil
|
||||||
|
case "aarch64", "arm64":
|
||||||
|
return "aarch64", nil
|
||||||
|
}
|
||||||
|
return "", fmt.Errorf("unknown arch %q", in)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GoArch turn an input arch into a go arch
|
||||||
|
func GoArch(in string) (string, error) {
|
||||||
|
switch in {
|
||||||
|
case "x86_64", "amd64":
|
||||||
|
return "amd64", nil
|
||||||
|
case "aarch64", "arm64":
|
||||||
|
return "arm64", nil
|
||||||
|
}
|
||||||
|
return "", fmt.Errorf("unknown arch %q", in)
|
||||||
|
}
|
53
tools/grub-dev/Dockerfile
Normal file
53
tools/grub-dev/Dockerfile
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
# this is really hard to build. Do not change this version unless you must
|
||||||
|
FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS grub-build
|
||||||
|
|
||||||
|
RUN apk add \
|
||||||
|
automake \
|
||||||
|
make \
|
||||||
|
bison \
|
||||||
|
gettext \
|
||||||
|
flex \
|
||||||
|
gcc \
|
||||||
|
git \
|
||||||
|
libtool \
|
||||||
|
libc-dev \
|
||||||
|
linux-headers \
|
||||||
|
python3 \
|
||||||
|
autoconf
|
||||||
|
|
||||||
|
# because python is not available
|
||||||
|
RUN ln -s python3 /usr/bin/python
|
||||||
|
|
||||||
|
ENV GRUB_MODULES="part_gpt fat ext2 iso9660 gzio linux acpi normal cpio crypto disk boot crc64 gpt \
|
||||||
|
search_disk_uuid tftp verify xzio xfs video"
|
||||||
|
ENV GRUB_COMMIT=2f868ac992be2ae3ab838951aa3e260c045f20f9
|
||||||
|
|
||||||
|
COPY patches/* /patches/
|
||||||
|
|
||||||
|
WORKDIR /src
|
||||||
|
RUN git clone https://github.com/coreos/grub.git grub
|
||||||
|
WORKDIR /src/grub
|
||||||
|
RUN git checkout -b grub-build ${GRUB_COMMIT}
|
||||||
|
RUN for patch in /patches/*.patch; do \
|
||||||
|
echo "Applying $patch"; \
|
||||||
|
patch -p1 < "$patch"; \
|
||||||
|
done
|
||||||
|
|
||||||
|
RUN ./autogen.sh
|
||||||
|
|
||||||
|
RUN ./configure --libdir=/grub-lib --with-platform=efi CFLAGS="-Os -Wno-unused-value"
|
||||||
|
RUN make -j "$(getconf _NPROCESSORS_ONLN)"
|
||||||
|
RUN make install
|
||||||
|
RUN case $(uname -m) in \
|
||||||
|
x86_64) \
|
||||||
|
./grub-mkimage -O x86_64-efi -d /grub-lib/grub/x86_64-efi -o /grub-lib/BOOTX64.EFI -p /EFI/BOOT ${GRUB_MODULES} linuxefi; \
|
||||||
|
;; \
|
||||||
|
aarch64) \
|
||||||
|
./grub-mkimage -O arm64-efi -d /grub-lib/grub/arm64-efi -o /grub-lib/BOOTAA64.EFI -p /EFI/BOOT ${GRUB_MODULES}; \
|
||||||
|
;; \
|
||||||
|
esac
|
||||||
|
|
||||||
|
FROM scratch
|
||||||
|
ENTRYPOINT []
|
||||||
|
WORKDIR /
|
||||||
|
COPY --from=grub-build /grub-lib/*.EFI /
|
5
tools/grub-dev/build.yml
Normal file
5
tools/grub-dev/build.yml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
image: grub-dev
|
||||||
|
network: true
|
||||||
|
arches:
|
||||||
|
- arm64
|
||||||
|
- amd64
|
@ -1,52 +1,9 @@
|
|||||||
# this is really hard to build. Do not change this version unless you must
|
# this is really hard to build. Do not change this version unless you must
|
||||||
FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS grub-build
|
FROM --platform=linux/amd64 linuxkit/grub-dev:e94da02aac3a39fec34047051a40d367e61cd0a0 AS grub-build-amd64
|
||||||
|
FROM --platform=linux/arm64 linuxkit/grub-dev:e94da02aac3a39fec34047051a40d367e61cd0a0 AS grub-build-arm64
|
||||||
RUN apk add \
|
|
||||||
automake \
|
|
||||||
make \
|
|
||||||
bison \
|
|
||||||
gettext \
|
|
||||||
flex \
|
|
||||||
gcc \
|
|
||||||
git \
|
|
||||||
libtool \
|
|
||||||
libc-dev \
|
|
||||||
linux-headers \
|
|
||||||
python3 \
|
|
||||||
autoconf
|
|
||||||
|
|
||||||
# because python is not available
|
|
||||||
RUN ln -s python3 /usr/bin/python
|
|
||||||
|
|
||||||
ENV GRUB_MODULES="part_gpt fat ext2 iso9660 gzio linux acpi normal cpio crypto disk boot crc64 gpt \
|
|
||||||
search_disk_uuid tftp verify xzio xfs video"
|
|
||||||
ENV GRUB_COMMIT=2f868ac992be2ae3ab838951aa3e260c045f20f9
|
|
||||||
|
|
||||||
COPY patches/* /patches/
|
|
||||||
|
|
||||||
WORKDIR /src
|
|
||||||
RUN git clone https://github.com/coreos/grub.git grub
|
|
||||||
WORKDIR /src/grub
|
|
||||||
RUN git checkout -b grub-build ${GRUB_COMMIT}
|
|
||||||
RUN for patch in /patches/*.patch; do \
|
|
||||||
echo "Applying $patch"; \
|
|
||||||
patch -p1 < "$patch"; \
|
|
||||||
done
|
|
||||||
|
|
||||||
RUN ./autogen.sh
|
|
||||||
RUN ./configure --libdir=/grub-lib --with-platform=efi CFLAGS="-Os -Wno-unused-value"
|
|
||||||
RUN make -j "$(getconf _NPROCESSORS_ONLN)"
|
|
||||||
RUN make install
|
|
||||||
RUN case $(uname -m) in \
|
|
||||||
x86_64) \
|
|
||||||
./grub-mkimage -O x86_64-efi -d /grub-lib/grub/x86_64-efi -o /grub-lib/BOOTX64.EFI -p /EFI/BOOT ${GRUB_MODULES} linuxefi; \
|
|
||||||
;; \
|
|
||||||
aarch64) \
|
|
||||||
./grub-mkimage -O arm64-efi -d /grub-lib/grub/arm64-efi -o /grub-lib/BOOTAA64.EFI -p /EFI/BOOT ${GRUB_MODULES}; \
|
|
||||||
;; \
|
|
||||||
esac
|
|
||||||
|
|
||||||
FROM scratch
|
FROM scratch
|
||||||
ENTRYPOINT []
|
ENTRYPOINT []
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
COPY --from=grub-build /grub-lib/*.EFI /
|
COPY --from=grub-build-amd64 /*.EFI /
|
||||||
|
COPY --from=grub-build-arm64 /*.EFI /
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM linuxkit/grub:4de02c056b3295f510b7fb4f9b5a2785f854ac23 AS grub
|
FROM linuxkit/grub:292deb743d85eb79cbd5b163841db8ccd2500677 AS grub
|
||||||
|
|
||||||
FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
|
FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
|
||||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
|
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
# get the GRUB2 boot file name
|
# get the GRUB2 boot file name
|
||||||
ARCH=`uname -m`
|
ARCH=${TARGETARCH:-`uname -m`}
|
||||||
case $ARCH in
|
case $ARCH in
|
||||||
x86_64)
|
x86_64)
|
||||||
BOOTFILE=BOOTX64.EFI
|
BOOTFILE=BOOTX64.EFI
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM linuxkit/grub:4de02c056b3295f510b7fb4f9b5a2785f854ac23 AS grub
|
FROM linuxkit/grub:292deb743d85eb79cbd5b163841db8ccd2500677 AS grub
|
||||||
|
|
||||||
FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
|
FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
|
||||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
|
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
# get the GRUB2 boot file name
|
# get the GRUB2 boot file name
|
||||||
ARCH=`uname -m`
|
ARCH=${TARGETARCH:-`uname -m`}
|
||||||
case $ARCH in
|
case $ARCH in
|
||||||
x86_64)
|
x86_64)
|
||||||
BOOTFILE=BOOTX64.EFI
|
BOOTFILE=BOOTX64.EFI
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM linuxkit/grub:4de02c056b3295f510b7fb4f9b5a2785f854ac23 AS grub
|
FROM linuxkit/grub:292deb743d85eb79cbd5b163841db8ccd2500677 AS grub
|
||||||
|
|
||||||
FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
|
FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
|
||||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
|
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
|
||||||
|
@ -15,7 +15,7 @@ ESP_FILE=$PWD/boot.img
|
|||||||
|
|
||||||
|
|
||||||
# get the GRUB2 boot file name
|
# get the GRUB2 boot file name
|
||||||
ARCH=`uname -m`
|
ARCH=${TARGETARCH:-`uname -m`}
|
||||||
case $ARCH in
|
case $ARCH in
|
||||||
x86_64)
|
x86_64)
|
||||||
BOOTFILE=BOOTX64.EFI
|
BOOTFILE=BOOTX64.EFI
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM linuxkit/grub:4de02c056b3295f510b7fb4f9b5a2785f854ac23 AS grub
|
FROM linuxkit/grub:292deb743d85eb79cbd5b163841db8ccd2500677 AS grub
|
||||||
|
|
||||||
FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
|
FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
|
||||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
|
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
|
||||||
|
@ -15,7 +15,7 @@ ESP_FILE=$PWD/boot.img
|
|||||||
|
|
||||||
|
|
||||||
# get the GRUB2 boot file name
|
# get the GRUB2 boot file name
|
||||||
ARCH=`uname -m`
|
ARCH=${TARGETARCH:-`uname -m`}
|
||||||
case $ARCH in
|
case $ARCH in
|
||||||
x86_64)
|
x86_64)
|
||||||
BOOTFILE=BOOTX64.EFI
|
BOOTFILE=BOOTX64.EFI
|
||||||
|
Loading…
Reference in New Issue
Block a user