Merge pull request #8158 from Rmys/master

qemu ver. bump

hardware/virtualization/qemu/actions.py

@@ -29,7 +29,7 @@ builddirkvmtest = "kvm/test"
 targetListKvm = "x86_64-softmmu"
 targetList = "i386-softmmu x86_64-softmmu arm-softmmu cris-softmmu m68k-softmmu \
               mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu ppc-softmmu \
-              ppcemb-softmmu ppc64-softmmu sh4-softmmu sh4eb-softmmu sparc-softmmu \
+              ppc64-softmmu sh4-softmmu sh4eb-softmmu sparc-softmmu \
               i386-linux-user x86_64-linux-user alpha-linux-user arm-linux-user \
               armeb-linux-user cris-linux-user m68k-linux-user mips-linux-user \
               mipsel-linux-user ppc-linux-user ppc64-linux-user ppc64abi32-linux-user \
@@ -58,7 +58,7 @@ def printfancy(msg):
     print
 
 def setup():
-    shelltools.system("sed -i 's/ memfd_create/ qemu_memfd_create/' util/memfd.c")
+    #shelltools.system("sed -i 's/ memfd_create/ qemu_memfd_create/' util/memfd.c")
     
     # disable fdt until dtc is in repo
     # pisitools.dosed("configure", 'fdt="yes"', 'fdt="no"')
@@ -119,6 +119,6 @@ def install():
     shelltools.system("chmod u+s %s/usr/lib/qemu/qemu-bridge-helper" % get.installDIR())
     pisitools.insinto("/etc/sasl2/", "qemu.sasl", "qemu.conf")
 
-    for i in ["pc-bios/README", "LICENSE", "README", "COPYING*"]:
+    for i in ["pc-bios/README", "LICENSE", "README*", "COPYING*"]:
         pisitools.dodoc(i)
 

hardware/virtualization/qemu/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>app:console</IsA>
         <Summary>Userspace virtual machine and processor emulator</Summary>
         <Description>QEMU emulates a full system (for example a PC), including a processor and various peripherials. It can be used to launch different operating systems without rebooting the PC or to debug system code. In user-mode emulation mode, QEMU can launch Linux processes compiled for one CPU on another CPU.</Description>
-        <Archive sha1sum="9c3a64884bcf8525010be62bdb2cf62f4e5abe1f" type="tarbz2">http://wiki.qemu-project.org/download/qemu-2.11.1.tar.bz2</Archive>
+        <Archive sha1sum="0652ee1086fcbbc5dec6e7bfe67ad977a5d09db2" type="tarbz2">http://wiki.qemu-project.org/download/qemu-4.2.0.tar.bz2</Archive>
         <!--
         <AdditionalFiles>
             <AdditionalFile target="kernel/include/linux/kvm.h">kvm-2.6.32-16.h</AdditionalFile>
@@ -31,6 +31,8 @@
             <Dependency>pulseaudio-libs-devel</Dependency>
             <Dependency>python-devel</Dependency>
             <Dependency>glib2-devel</Dependency>
+            
+            <Dependency>libsdl2-devel</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -75,7 +77,10 @@
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="man">/usr/share/man</Path>
             <Path fileType="data">/usr/share/qemu</Path>
+            <Path fileType="data">/usr/share</Path>
+            <Path fileType="icon">/usr/share/icons/hicolor</Path>
             <Path fileType="localedata">/usr/share/locale/</Path>
+            <Path fileType="header">/usr/include</Path>
         </Files>
         <AdditionalFiles>
             <AdditionalFile owner="root" permission="0755" target="/usr/bin/qemu-ifup">qemu-ifup</AdditionalFile>
@@ -106,6 +111,13 @@
     </Package>-->
 
     <History>
+        <Update release="5">
+            <Date>2020-03-13</Date>
+            <Version>4.2.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2018-08-31</Date>
             <Version>2.11.1</Version>