From 7ab99eac1f3274bd1c3d19dc8fee2ba85552a015 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Thu, 5 Oct 2023 10:15:16 +0300 Subject: [PATCH] pass target arch to final image builder as TARGETARCH; use TARGETARCH when generating raw and iso, fallback to build arch; use updated images that read TARGETARCH; ensure grub has EFI for all archs Signed-off-by: Avi Deitcher --- src/cmd/linuxkit/build.go | 2 +- src/cmd/linuxkit/moby/docker.go | 11 ++- src/cmd/linuxkit/moby/images.yaml | 8 +- src/cmd/linuxkit/moby/output.go | 99 +++++++++++-------- src/cmd/linuxkit/util/arch.go | 25 +++++ tools/grub-dev/Dockerfile | 53 ++++++++++ tools/grub-dev/build.yml | 5 + ...reat-R_X86_64_PLT32-as-R_X86_64_PC32.patch | 0 tools/grub/Dockerfile | 51 +--------- tools/mkimage-iso-efi-initrd/Dockerfile | 2 +- tools/mkimage-iso-efi-initrd/make-efi-initrd | 2 +- tools/mkimage-iso-efi/Dockerfile | 2 +- tools/mkimage-iso-efi/make-efi | 2 +- tools/mkimage-qcow2-efi/Dockerfile | 2 +- tools/mkimage-qcow2-efi/make-efi | 2 +- tools/mkimage-raw-efi/Dockerfile | 2 +- tools/mkimage-raw-efi/make-efi | 2 +- 17 files changed, 166 insertions(+), 104 deletions(-) create mode 100644 src/cmd/linuxkit/util/arch.go create mode 100644 tools/grub-dev/Dockerfile create mode 100644 tools/grub-dev/build.yml rename tools/{grub => grub-dev}/patches/treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch (100%) diff --git a/src/cmd/linuxkit/build.go b/src/cmd/linuxkit/build.go index 87c514ffb..d1f222a3b 100644 --- a/src/cmd/linuxkit/build.go +++ b/src/cmd/linuxkit/build.go @@ -204,7 +204,7 @@ The generated image can be in one of multiple formats which can be run on variou } 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 { return fmt.Errorf("Error writing outputs: %v", err) } diff --git a/src/cmd/linuxkit/moby/docker.go b/src/cmd/linuxkit/moby/docker.go index 314a9f7d2..d2300fa6a 100644 --- a/src/cmd/linuxkit/moby/docker.go +++ b/src/cmd/linuxkit/moby/docker.go @@ -15,8 +15,8 @@ import ( ) // dockerRun is outside the linuxkit/docker package, because that is for caching, this is -// used for running to build images. -func dockerRun(input io.Reader, output io.Writer, img string, args ...string) error { +// 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, runEnv []string, args ...string) error { log.Debugf("docker run %s (input): %s", img, strings.Join(args, " ")) docker, err := exec.LookPath("docker") if err != nil { @@ -36,7 +36,12 @@ func dockerRun(input io.Reader, output io.Writer, img string, args ...string) er } 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.Stderr = &errbuf cmd.Stdin = input diff --git a/src/cmd/linuxkit/moby/images.yaml b/src/cmd/linuxkit/moby/images.yaml index 18a71a61c..022dd0cf4 100644 --- a/src/cmd/linuxkit/moby/images.yaml +++ b/src/cmd/linuxkit/moby/images.yaml @@ -1,12 +1,12 @@ iso: linuxkit/mkimage-iso:1f6fdf0ee860caf13c06a6f3f2d89413de78881e iso-bios: linuxkit/mkimage-iso-bios:314c06ec0d72f12057c9e8d5fdf790df02dbc8c2 - iso-efi: linuxkit/mkimage-iso-efi:b74d215d594ccdf7d51fa412518b2f895aa7f9dc - iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:0e66171ffde9bb735b0e014f811f9626fc8b9bc9 + iso-efi: linuxkit/mkimage-iso-efi:55b72b55ffea82d1c254c0ff5cb65df0c2c04528 + iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:f7fba1acaee8afbea2771717c9faf758d0a66a87 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 gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098 - qcow2-efi: linuxkit/mkimage-qcow2-efi:67d5e16228dfb434ac5418bafac720bf23bbaf42 + qcow2-efi: linuxkit/mkimage-qcow2-efi:19cb758d47c07169bc4772a7576e28d56740b004 vhd: linuxkit/mkimage-vhd:91bcc7a6475f46a3d5d84cf6161f07c583dd9c21 dynamic-vhd: linuxkit/mkimage-dynamic-vhd:b755f8ff82c8631d18decaebb09867e7b88c2533 vmdk: linuxkit/mkimage-vmdk:20a370a55bd8d58c2ae9d634c297a955bb006efd diff --git a/src/cmd/linuxkit/moby/output.go b/src/cmd/linuxkit/moby/output.go index d3b61f61e..2719e0266 100644 --- a/src/cmd/linuxkit/moby/output.go +++ b/src/cmd/linuxkit/moby/output.go @@ -15,6 +15,7 @@ import ( "strings" "github.com/linuxkit/linuxkit/src/cmd/linuxkit/initrd" + "github.com/linuxkit/linuxkit/src/cmd/linuxkit/util" log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" ) @@ -23,8 +24,8 @@ import ( var imagesBytes []byte var outputImages map[string]string -var outFuns = map[string]func(string, io.Reader, int) error{ - "kernel+initrd": func(base string, image io.Reader, size 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, arch string) error { kernel, initrd, cmdline, ucode, err := tarToInitrd(image) if err != nil { 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 }, - "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) if err != nil { 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 }, - "iso-bios": func(base string, image io.Reader, size int) error { - err := outputIso(outputImages["iso-bios"], base+".iso", image) + "iso-bios": func(base string, image io.Reader, size int, arch string) error { + err := outputIso(outputImages["iso-bios"], base+".iso", image, arch) if err != nil { return fmt.Errorf("Error writing iso-bios output: %v", err) } return nil }, - "iso-efi": func(base string, image io.Reader, size int) error { - err := outputIso(outputImages["iso-efi"], base+"-efi.iso", image) + "iso-efi": func(base string, image io.Reader, size int, arch string) error { + err := outputIso(outputImages["iso-efi"], base+"-efi.iso", image, arch) if err != nil { return fmt.Errorf("Error writing iso-efi output: %v", err) } 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) if err != nil { 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 { return fmt.Errorf("Error writing iso-efi-initrd output: %v", err) } 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) if err != nil { return fmt.Errorf("Error converting to initrd: %v", err) } // 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 { return fmt.Errorf("Error writing raw-bios output: %v", err) } 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) if err != nil { 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 { return fmt.Errorf("Error writing raw-efi output: %v", err) } return nil }, - "kernel+squashfs": func(base string, image io.Reader, size int) error { - err := outputKernelSquashFS(outputImages["squashfs"], base, image) + "kernel+squashfs": func(base string, image io.Reader, size int, arch string) error { + err := outputKernelSquashFS(outputImages["squashfs"], base, image, arch) if err != nil { return fmt.Errorf("Error writing kernel+squashfs output: %v", err) } return nil }, - "kernel+iso": func(base string, image io.Reader, size int) error { - err := outputKernelISO(outputImages["iso"], base, image) + "kernel+iso": func(base string, image io.Reader, size int, arch string) error { + err := outputKernelISO(outputImages["iso"], base, image, arch) if err != nil { return fmt.Errorf("Error writing kernel+iso output: %v", err) } 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" log.Infof(" %s", filename) kernel, initrd, cmdline, _, err := tarToInitrd(image) @@ -121,29 +122,29 @@ var outFuns = map[string]func(string, io.Reader, int) error{ } 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) if err != nil { 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 { return fmt.Errorf("Error writing gcp output: %v", err) } 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) if err != nil { 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 { return fmt.Errorf("Error writing qcow2 EFI output: %v", err) } 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" log.Infof(" %s", filename) kernel, initrd, cmdline, _, err := tarToInitrd(image) @@ -157,40 +158,40 @@ var outFuns = map[string]func(string, io.Reader, int) error{ } 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) if err != nil { 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 { return fmt.Errorf("Error writing vhd output: %v", err) } 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) if err != nil { 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 { return fmt.Errorf("Error writing vhd output: %v", err) } 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) if err != nil { 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 { return fmt.Errorf("Error writing vmdk output: %v", err) } 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" { 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 -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) err := ValidateFormats(formats, cache) @@ -265,7 +266,7 @@ func Formats(base string, image string, formats []string, size int, cache string } defer ir.Close() f := outFuns[o] - if err := f(base, ir, size); err != nil { + if err := f(base, ir, size, arch); err != nil { return err } } @@ -336,7 +337,7 @@ func tarInitrdKernel(kernel, initrd []byte, cmdline string) (*bytes.Buffer, erro 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.Infof(" %s", filename) buf, err := tarInitrdKernel(kernel, initrd, cmdline) @@ -348,10 +349,14 @@ func outputImg(image, filename string, kernel []byte, initrd []byte, cmdline str return err } 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.Infof(" %s", filename) output, err := os.Create(filename) @@ -359,7 +364,11 @@ func outputIso(image, filename string, filesystem io.Reader) error { return err } 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 { @@ -370,7 +379,7 @@ func outputRPi3(image, filename string, filesystem io.Reader) error { return err } 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 { @@ -482,7 +491,7 @@ func outputKernelInitrdTarball(base string, kernel []byte, initrd []byte, cmdlin 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.Infof(" %s-squashfs.img", base) @@ -534,10 +543,14 @@ func outputKernelSquashFS(image, base string, filesystem io.Reader) error { } 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.Infof(" %s.iso", base) @@ -589,5 +602,9 @@ func outputKernelISO(image, base string, filesystem io.Reader) error { } 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)}) } diff --git a/src/cmd/linuxkit/util/arch.go b/src/cmd/linuxkit/util/arch.go new file mode 100644 index 000000000..747e65097 --- /dev/null +++ b/src/cmd/linuxkit/util/arch.go @@ -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) +} diff --git a/tools/grub-dev/Dockerfile b/tools/grub-dev/Dockerfile new file mode 100644 index 000000000..ab7ce5ce4 --- /dev/null +++ b/tools/grub-dev/Dockerfile @@ -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 / diff --git a/tools/grub-dev/build.yml b/tools/grub-dev/build.yml new file mode 100644 index 000000000..e3dbcb972 --- /dev/null +++ b/tools/grub-dev/build.yml @@ -0,0 +1,5 @@ +image: grub-dev +network: true +arches: + - arm64 + - amd64 diff --git a/tools/grub/patches/treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch b/tools/grub-dev/patches/treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch similarity index 100% rename from tools/grub/patches/treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch rename to tools/grub-dev/patches/treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch diff --git a/tools/grub/Dockerfile b/tools/grub/Dockerfile index f97a67f01..4d6209ca7 100644 --- a/tools/grub/Dockerfile +++ b/tools/grub/Dockerfile @@ -1,52 +1,9 @@ # 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 --platform=linux/amd64 linuxkit/grub-dev:e94da02aac3a39fec34047051a40d367e61cd0a0 AS grub-build-amd64 +FROM --platform=linux/arm64 linuxkit/grub-dev:e94da02aac3a39fec34047051a40d367e61cd0a0 AS grub-build-arm64 FROM scratch ENTRYPOINT [] WORKDIR / -COPY --from=grub-build /grub-lib/*.EFI / +COPY --from=grub-build-amd64 /*.EFI / +COPY --from=grub-build-arm64 /*.EFI / diff --git a/tools/mkimage-iso-efi-initrd/Dockerfile b/tools/mkimage-iso-efi-initrd/Dockerfile index a812cdce1..7dd4a80a3 100644 --- a/tools/mkimage-iso-efi-initrd/Dockerfile +++ b/tools/mkimage-iso-efi-initrd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/grub:4de02c056b3295f510b7fb4f9b5a2785f854ac23 AS grub +FROM linuxkit/grub:292deb743d85eb79cbd5b163841db8ccd2500677 AS grub FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ diff --git a/tools/mkimage-iso-efi-initrd/make-efi-initrd b/tools/mkimage-iso-efi-initrd/make-efi-initrd index 98cfbe06f..ed8b84cfd 100755 --- a/tools/mkimage-iso-efi-initrd/make-efi-initrd +++ b/tools/mkimage-iso-efi-initrd/make-efi-initrd @@ -3,7 +3,7 @@ set -e # get the GRUB2 boot file name -ARCH=`uname -m` +ARCH=${TARGETARCH:-`uname -m`} case $ARCH in x86_64) BOOTFILE=BOOTX64.EFI diff --git a/tools/mkimage-iso-efi/Dockerfile b/tools/mkimage-iso-efi/Dockerfile index 56ae8dfab..98fc352a3 100644 --- a/tools/mkimage-iso-efi/Dockerfile +++ b/tools/mkimage-iso-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/grub:4de02c056b3295f510b7fb4f9b5a2785f854ac23 AS grub +FROM linuxkit/grub:292deb743d85eb79cbd5b163841db8ccd2500677 AS grub FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ diff --git a/tools/mkimage-iso-efi/make-efi b/tools/mkimage-iso-efi/make-efi index a499e119b..9a5ef53a9 100755 --- a/tools/mkimage-iso-efi/make-efi +++ b/tools/mkimage-iso-efi/make-efi @@ -3,7 +3,7 @@ set -e # get the GRUB2 boot file name -ARCH=`uname -m` +ARCH=${TARGETARCH:-`uname -m`} case $ARCH in x86_64) BOOTFILE=BOOTX64.EFI diff --git a/tools/mkimage-qcow2-efi/Dockerfile b/tools/mkimage-qcow2-efi/Dockerfile index 37ebc86b3..4e10803eb 100644 --- a/tools/mkimage-qcow2-efi/Dockerfile +++ b/tools/mkimage-qcow2-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/grub:4de02c056b3295f510b7fb4f9b5a2785f854ac23 AS grub +FROM linuxkit/grub:292deb743d85eb79cbd5b163841db8ccd2500677 AS grub FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ diff --git a/tools/mkimage-qcow2-efi/make-efi b/tools/mkimage-qcow2-efi/make-efi index 11a483c24..2090c4c12 100755 --- a/tools/mkimage-qcow2-efi/make-efi +++ b/tools/mkimage-qcow2-efi/make-efi @@ -15,7 +15,7 @@ ESP_FILE=$PWD/boot.img # get the GRUB2 boot file name -ARCH=`uname -m` +ARCH=${TARGETARCH:-`uname -m`} case $ARCH in x86_64) BOOTFILE=BOOTX64.EFI diff --git a/tools/mkimage-raw-efi/Dockerfile b/tools/mkimage-raw-efi/Dockerfile index a059c33cf..c28a90164 100644 --- a/tools/mkimage-raw-efi/Dockerfile +++ b/tools/mkimage-raw-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/grub:4de02c056b3295f510b7fb4f9b5a2785f854ac23 AS grub +FROM linuxkit/grub:292deb743d85eb79cbd5b163841db8ccd2500677 AS grub FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ diff --git a/tools/mkimage-raw-efi/make-efi b/tools/mkimage-raw-efi/make-efi index f9e0dba74..07a862eb0 100755 --- a/tools/mkimage-raw-efi/make-efi +++ b/tools/mkimage-raw-efi/make-efi @@ -15,7 +15,7 @@ ESP_FILE=$PWD/boot.img # get the GRUB2 boot file name -ARCH=`uname -m` +ARCH=${TARGETARCH:-`uname -m`} case $ARCH in x86_64) BOOTFILE=BOOTX64.EFI