qemu: enable on and for all supported architectures

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index 721c7f1db9e7c1db2914760d19a13db3f9f1a3db..6d1652cd1bb1a1a60bccb1d6b7c56eb07e3c07dc 100644 (file)
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -1,6 +1,7 @@
 lib/udev/rules.d/65-kvm.rules
 usr/bin/elf2dmp
 usr/bin/qemu
+usr/bin/qemu-aarch64
 usr/bin/qemu-arm
 usr/bin/qemu-edid
 #usr/bin/qemu-ga
@@ -11,6 +12,7 @@ usr/bin/qemu-nbd
 usr/bin/qemu-pr-helper
 usr/bin/qemu-riscv64
 usr/bin/qemu-storage-daemon
+usr/bin/qemu-system-aarch64
 usr/bin/qemu-system-arm
 usr/bin/qemu-system-i386
 usr/bin/qemu-system-riscv64
@@ -54,7 +56,7 @@ usr/share/qemu/bios-256k.bin
 usr/share/qemu/bios-microvm.bin
 usr/share/qemu/bios.bin
 #usr/share/qemu/canyonlands.dtb
-#usr/share/qemu/edk2-aarch64-code.fd
+usr/share/qemu/edk2-aarch64-code.fd
 usr/share/qemu/edk2-arm-code.fd
 usr/share/qemu/edk2-arm-vars.fd
 usr/share/qemu/edk2-i386-code.fd
@@ -74,7 +76,7 @@ usr/share/qemu/efi-vmxnet3.rom
 usr/share/qemu/firmware
 usr/share/qemu/firmware/50-edk2-i386-secure.json
 usr/share/qemu/firmware/50-edk2-x86_64-secure.json
-#usr/share/qemu/firmware/60-edk2-aarch64.json
+usr/share/qemu/firmware/60-edk2-aarch64.json
 usr/share/qemu/firmware/60-edk2-arm.json
 usr/share/qemu/firmware/60-edk2-i386.json
 usr/share/qemu/firmware/60-edk2-x86_64.json
@@ -124,8 +126,8 @@ usr/share/qemu/npcm7xx_bootrom.bin
 #usr/share/qemu/openbios-sparc64
 #usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.bin
 #usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-#usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.bin
-#usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.bin
+usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
 #usr/share/qemu/palcode-clipper
 #usr/share/qemu/petalogix-ml605.dtb
 #usr/share/qemu/petalogix-s3adsp1800.dtb

diff --git a/lfs/qemu b/lfs/qemu
index bc36bb4d7f26cf20403f8020aeb8583f03ec31d1..caf16e8300107aee970ec1ade4aaeb62c8d7c65d 100644 (file)
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,9 +32,8 @@ DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = x86_64
 PROG       = qemu
-PAK_VER    = 31
+PAK_VER    = 32
 
 DEPS       = libusbredir spice libseccomp
 
@@ -42,10 +41,12 @@ TARGETS    = \
        i386-linux-user \
        x86_64-linux-user \
        arm-linux-user \
+       aarch64-linux-user \
        riscv64-linux-user \
        i386-softmmu \
        x86_64-softmmu \
        arm-softmmu \
+       aarch64-softmmu \
        riscv64-softmmu
 
 ###############################################################################

diff --git a/lfs/qemu-ga b/lfs/qemu-ga
index 2130b57f37e344d90615939b68a774cdb187546e..1a89d4e96ee49901c4625972300b03cf322570d6 100644 (file)
--- a/lfs/qemu-ga
+++ b/lfs/qemu-ga
@@ -27,7 +27,6 @@ include Config
 VER        = 6.1.0
 THISAPP    = qemu-ga-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = x86_64
 PROG       = qemu-ga
 PAK_VER    = 1