diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2023-06-19 14:16:31 +0200 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2023-06-19 14:16:31 +0200 |
| commit | e36f7f1d7b8b2e41154dd07981129bace2293403 (patch) | |
| tree | 89084e393300445fab4888a9fa7d5295b5bff5ae /bin/debvm-run | |
| parent | df3057d10b644e2d01ab57a8ad0547de08dbdfb6 (diff) | |
| download | debvm-e36f7f1d7b8b2e41154dd07981129bace2293403.tar.gz | |
debvm-run: match on DEB_HOTS_ARCH_CPU rather than DEB_HOST_ARCH
This way we loose unnecessary detail such as libc, kernel and abi. For
one thing this simplifies the arm* match. For another, this makes us
stop think about arm64ilp32 or x32.
Diffstat (limited to 'bin/debvm-run')
| -rwxr-xr-x | bin/debvm-run | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/debvm-run b/bin/debvm-run index d09d8c7..406da39 100755 --- a/bin/debvm-run +++ b/bin/debvm-run @@ -274,18 +274,19 @@ set -- \ # This utilizes the QEMU Debian package symlink mapping that ensures that # calling qemu-system-${DEB_HOST_ARCH_CPU} will run the QEMU binary providing # the correct emulator for that CPU. -QEMU="qemu-system-$(dpkg-architecture --force --host-arch "$KERNELARCH" --query DEB_HOST_ARCH_CPU)" +KERNELARCHCPU="$(dpkg-architecture --force --host-arch "$KERNELARCH" --query DEB_HOST_ARCH_CPU)" +QEMU="qemu-system-$KERNELARCHCPU" CPU= MACHINE= MAX_SMP= NIC_DEV=virtio-net-pci,netdev=net0 RNG_DEV=virtio-rng-pci,rng=rng0 -case "$KERNELARCH" in +case "$KERNELARCHCPU" in amd64) MACHINE="type=q35" ;; - arm|armel|armhf) + arm) CPU=max MACHINE="type=virt" MAX_SMP=8 |