Merge pull request #108 from zeldin/adaptive-allarch

exclude arches with non-existing binary from allArch
tonistiigi · Oct 26, 2022 · 9977509 · 9977509
2 parents 2a8091f + e43f084
commit 9977509
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/cmd/binfmt/config.go b/cmd/binfmt/config.go
@@ -5,6 +5,7 @@ package main
 
 import (
 	"log"
+	"os"
 
 	"github.com/containerd/containerd/platforms"
 	"github.com/moby/buildkit/util/archutil"
@@ -80,7 +81,14 @@ func allArch() []string {
 	out := make([]string, 0, len(configs))
 	for name := range configs {
 		if _, ok := m[name]; !ok {
-			out = append(out, name)
+			if _, fullPath, err := getBinaryNames(configs[name]); err == nil {
+				if _, err := os.Stat(fullPath); err == nil {
+					out = append(out, name)
+				}
+			} else {
+				// Make sure install() will print the error
+				out = append(out, name)
+			}
 		}
 	}
 	return out

diff --git a/cmd/binfmt/main.go b/cmd/binfmt/main.go
@@ -44,6 +44,22 @@ func uninstall(arch string) error {
 	return errors.Errorf("not found")
 }
 
+func getBinaryNames(cfg config) (string, string, error) {
+	binaryPath := "/usr/bin"
+	if v := os.Getenv("QEMU_BINARY_PATH"); v != "" {
+		binaryPath = v
+	}
+	binaryBasename := cfg.binary
+	if binaryPrefix := os.Getenv("QEMU_BINARY_PREFIX"); binaryPrefix != "" {
+		if strings.ContainsRune(binaryPrefix, os.PathSeparator) {
+			return "", "", errors.New("binary prefix must not contain path separator (Hint: set $QEMU_BINARY_PATH to specify the directory)")
+		}
+		binaryBasename = binaryPrefix + binaryBasename
+	}
+	binaryFullpath := filepath.Join(binaryPath, binaryBasename)
+	return binaryBasename, binaryFullpath, nil
+}
+
 func install(arch string) error {
 	cfg, ok := configs[arch]
 	if !ok {
@@ -63,22 +79,14 @@ func install(arch string) error {
 	}
 	defer file.Close()
 
-	binaryPath := "/usr/bin"
-	if v := os.Getenv("QEMU_BINARY_PATH"); v != "" {
-		binaryPath = v
-	}
 	flags := "CF"
 	if v := os.Getenv("QEMU_PRESERVE_ARGV0"); v != "" {
 		flags += "P"
 	}
-	binaryBasename := cfg.binary
-	if binaryPrefix := os.Getenv("QEMU_BINARY_PREFIX"); binaryPrefix != "" {
-		if strings.ContainsRune(binaryPrefix, os.PathSeparator) {
-			return errors.New("binary prefix must not contain path separator (Hint: set $QEMU_BINARY_PATH to specify the directory)")
-		}
-		binaryBasename = binaryPrefix + binaryBasename
+	binaryBasename, binaryFullpath, err := getBinaryNames(cfg)
+	if err != nil {
+		return err
 	}
-	binaryFullpath := filepath.Join(binaryPath, binaryBasename)
 
 	line := fmt.Sprintf(":%s:M:0:%s:%s:%s:%s", binaryBasename, cfg.magic, cfg.mask, binaryFullpath, flags)