Merge pull request #174 from vicamo/for-upstream/match-loong64-arch-name

binfmt: match loong64 arch name to containerd known arches
tonistiigi · Jun 15, 2024 · 6bccaba · 6bccaba
2 parents dc7c02a + 14dea10
commit 6bccaba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -114,7 +114,7 @@ jobs:
         name: Test mainline
         if: matrix.target == 'mainline'
         run: |
-          docker run --rm --privileged tonistiigi/binfmt:test --uninstall amd64,arm64,arm,ppc64le,s390x,riscv64,loongarch64
+          docker run --rm --privileged tonistiigi/binfmt:test --uninstall qemu-*
           docker run --rm --privileged tonistiigi/binfmt:test --install all
           docker run --rm arm64v8/alpine uname -a
           docker run --rm arm32v7/alpine uname -a

diff --git a/cmd/binfmt/config.go b/cmd/binfmt/config.go
@@ -65,7 +65,7 @@ var configs = map[string]config{
 		magic:  `\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08`,
 		mask:   `\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff`,
 	},
-	"loongarch64": {
+	"loong64": {
 		binary: "qemu-loongarch64",
 		magic:  `\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02\x01`,
 		mask:   `\xff\xff\xff\xff\xff\xff\xff\xfc\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff`,