diff options
| author | Jochen Sprickerhof <git@jochen.sprickerhof.de> | 2022-12-21 20:09:03 +0100 |
|---|---|---|
| committer | Jochen Sprickerhof <git@jochen.sprickerhof.de> | 2022-12-22 13:58:40 +0100 |
| commit | aadbcc92761cf3bbc730ccf39aa5e09d22f343db (patch) | |
| tree | 330c39ddaabb0f081168fe80054783341968c16a | |
| parent | 8098d9d558a1e52736af4183a0e0152300193c54 (diff) | |
| download | debvm-aadbcc92761cf3bbc730ccf39aa5e09d22f343db.tar.gz | |
Support mips* (Closes: #1)
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | debvm-create | 4 | ||||
| -rwxr-xr-x | debvm-run | 13 |
3 files changed, 14 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed0fc32..b2ce36c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,6 +63,8 @@ arch_test: - arm64 - armhf - i386 + - mips64el + - mipsel - ppc64el - s390x before_script: diff --git a/debvm-create b/debvm-create index c44b67d..cbf1a04 100755 --- a/debvm-create +++ b/debvm-create @@ -96,10 +96,10 @@ case "$ARCHITECTURE" in KERNEL_SUFFIX=-686-pae ;; mips64el) - KERNEL_SUFFIX=-mips64r2el + KERNEL_SUFFIX=-5kc-malta ;; mipsel) - KERNEL_SUFFIX=-mips32r2el + KERNEL_SUFFIX=-4kc-malta ;; ppc64el) KERNEL_SUFFIX=-powerpc64le @@ -93,7 +93,6 @@ set -- \ -no-user-config \ -name "debvm-run $IMAGE" \ -m 1G \ - -smp "$(nproc)" \ -kernel "$KERNELTMP" \ -initrd "$INITRDTMP" \ -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0 \ @@ -117,17 +116,25 @@ else case "$VMARCH" in arm64) QEMU=qemu-system-aarch64 - set -- -machine virt -cpu max "$@" + set -- -machine virt -cpu max -smp "$(nproc)" "$@" ;; arm|armel|armhf) QEMU=qemu-system-arm - set -- -machine virt -cpu max "$@" + set -- -machine virt -cpu max -smp "$(nproc)" "$@" ;; ppc64el) QEMU=qemu-system-ppc64 ;; + mips64el) + QEMU="qemu-system-$VMARCH" + set -- -cpu 5KEc "$@" + ;; + mipsel) + QEMU="qemu-system-$VMARCH" + ;; *) QEMU="qemu-system-$VMARCH" + set -- -smp "$(nproc)" "$@" ;; esac fi |