Merge branch 'master' into next

[people/mfischer/ipfire-2.x.git] / lfs / qemu

diff --git a/lfs/qemu b/lfs/qemu
index 689dba96db84c46908f6475efb6194e8c18b3937..e15d676685799644540617d059149e30d9b8396a 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        #
@@ -24,27 +24,33 @@
 
 include Config
 
-VER        = 5.2.0
+SUMMARY    = Machine emulator and virtualizer
+
+# If you update the version also qemu-ga !!!
+VER        = 6.1.0
 
 THISAPP    = qemu-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = i586 x86_64
 PROG       = qemu
-PAK_VER    = 30
+PAK_VER    = 32
 
 DEPS       = libusbredir spice libseccomp
 
+SERVICES   =
+
 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
 
 ###############################################################################
@@ -55,7 +61,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 179f86928835da857c237b42f4b2df73
+$(DL_FILE)_MD5 = 47f776c276a24f42108ba512a2aa3013
 
 install : $(TARGET)
 
@@ -65,7 +71,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
        @$(PAK)
 
 ###############################################################################
@@ -88,7 +94,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-5.2.0-no-pie.patch
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/etc \