fix(buster mipsbe): kernel-name=4kc-malta

2cd · Apr 9, 2024 · 27c6fc4 · 27c6fc4
1 parent f841597
commit 27c6fc4
Showing 1 changed file with 57 additions and 60 deletions.
diff --git a/.github/workflows/vm-minimal.yml b/.github/workflows/vm-minimal.yml
@@ -54,56 +54,56 @@ jobs:
           #   tty: ttyS0
           #   net: enp0s1
           # # ------------------
-          - arch: arm64
-            deb_arch: arm64
-            qemu_pkg_arch: arm
-            tty: ttyAMA0
-            net: enp0s1
-
-          - arch: armv7a
-            deb_arch: armhf
-            qemu_pkg_arch: arm
-            tty: ttyAMA0
-            net: enp0s1
-
-          - arch: x64
-            deb_arch: amd64
-            qemu_pkg_arch: x86
-            tty: ttyS0
-            net: enp0s2
+          # - arch: arm64
+          #   deb_arch: arm64
+          #   qemu_pkg_arch: arm
+          #   tty: ttyAMA0
+          #   net: enp0s1
 
-          - arch: x86
-            deb_arch: i386
-            qemu_pkg_arch: x86
-            tty: ttyS0
-            net: ens3
-
-          - arch: ppc64le
-            deb_arch: ppc64el
-            qemu_pkg_arch: ppc
-            tty: hev0
-            net: enp0s0
-
-          - arch: s390x
-            deb_arch: s390x
-            qemu_pkg_arch: misc
-            tty: ttysclp0
-            # enP1p0s0
-            net: eno1
-
-          - arch: mips64le
-            deb_arch: mips64el
-            qemu_pkg_arch: mips
-            tty: ttyS0
-            net: enp0s3
-          # ------------------------
-          # BOOKWORM
-          - arch: mipsle
-            deb_arch: mipsel
-            qemu_pkg_arch: mips
-            tty: ttyS0
-            net: enp0s18
-          # ------------------------
+          # - arch: armv7a
+          #   deb_arch: armhf
+          #   qemu_pkg_arch: arm
+          #   tty: ttyAMA0
+          #   net: enp0s1
+
+          # - arch: x64
+          #   deb_arch: amd64
+          #   qemu_pkg_arch: x86
+          #   tty: ttyS0
+          #   net: enp0s2
+
+          # - arch: x86
+          #   deb_arch: i386
+          #   qemu_pkg_arch: x86
+          #   tty: ttyS0
+          #   net: ens3
+
+          # - arch: ppc64le
+          #   deb_arch: ppc64el
+          #   qemu_pkg_arch: ppc
+          #   tty: hev0
+          #   net: enp0s0
+
+          # - arch: s390x
+          #   deb_arch: s390x
+          #   qemu_pkg_arch: misc
+          #   tty: ttysclp0
+          #   # enP1p0s0
+          #   net: eno1
+
+          # - arch: mips64le
+          #   deb_arch: mips64el
+          #   qemu_pkg_arch: mips
+          #   tty: ttyS0
+          #   net: enp0s3
+          # # ------------------------
+          # # BOOKWORM
+          # - arch: mipsle
+          #   deb_arch: mipsel
+          #   qemu_pkg_arch: mips
+          #   tty: ttyS0
+          #   net: enp0s18
+          # # ------------------------
           # BUSTER
           - arch: mipsbe
             deb_arch: mips
@@ -117,7 +117,7 @@ jobs:
       neither_x86_nor_loong: ${{ !contains(fromJSON('["x64", "x86", "loong64"]'), matrix.arch) }}
       non_loong: ${{ matrix.arch != 'loong64' }}
       is_loong: ${{ matrix.arch == 'loong64' }}
-      deb_main_supported: ${{ contains(fromJSON('["x64", "x86", "arm64", "armv7a", "rv64gc", "ppc64le", "s390x", "mips64le", "mipsle"]'), matrix.arch) }}
+      deb_main_supported: ${{ contains(fromJSON('["x64", "x86", "arm64", "armv7a", "rv64gc", "ppc64le", "s390x", "mips64le"]'), matrix.arch) }}
       DEBUG_MODE: false
       #
       # debug:
@@ -274,16 +274,13 @@ jobs:
         if: fromJSON(env.non_loong)
         run: |
           case ${{matrix.arch}} {
-            (arm64|x64)   kernel=cloud-${{matrix.deb_arch}} ;;
-            (armv7a)      kernel=armmp-lpae                 ;;
-            (ppc64le)     kernel=powerpc64le                ;;
-            (x86)         kernel=686                        ;;
-            #
-            # loongson-3, mips64r2el, octeon
-            (mips64le)    kernel=loongson-3                 ;;
-            # loongson-3, mips32r2el, octeon, 4kc-malta
-            (mipsle)      kernel=4kc-malta                  ;;
-            (*)           kernel=${{matrix.deb_arch}}       ;;
+            (arm64|x64)     kernel=cloud-${{matrix.deb_arch}} ;;
+            (armv7a)        kernel=armmp-lpae                 ;;
+            (ppc64le)       kernel=powerpc64le                ;;
+            (x86)           kernel=686                        ;;
+            (mips64le)      kernel=loongson-3                 ;;
+            (mipsbe|mipsle) kernel=4kc-malta                  ;;
+            (*)             kernel=${{matrix.deb_arch}}       ;;
           }
           sudo cp -a rootfs kernel_r
           sudo systemd-nspawn -D kernel_r sh -c "apt-install linux-image-${kernel}"