upgpkg: qemu-minimal 2.10.1-1

3 files changed, 44 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d2f7959824a..6c6e5f1347bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri May 12 00:39:08 UTC 2017
+# Wed Nov  8 06:44:07 UTC 2017
 pkgbase = qemu-minimal
 	pkgdesc = A generic and open source machine emulator and virtualizer. This is a stripped-down version of the official package and requires only the bare essentials for running on a headless server.
-	pkgver = 2.9.0
+	pkgver = 2.10.1
 	pkgrel = 1
 	url = http://wiki.qemu.org/
 	arch = i686
@@ -21,16 +21,18 @@ pkgbase = qemu-minimal
 	depends = libcap-ng
 	conflicts = qemu
 	conflicts = qemu-headless
-	source = http://wiki.qemu.org//download/qemu-2.9.0.tar.bz2
-	source = http://wiki.qemu.org//download/qemu-2.9.0.tar.bz2.sig
+	source = http://wiki.qemu.org//download/qemu-2.10.1.tar.bz2
+	source = http://wiki.qemu.org//download/qemu-2.10.1.tar.bz2.sig
 	source = qemu.sysusers
 	source = qemu-ga.service
 	source = 65-kvm.rules
-	sha256sums = 00bfb217b1bb03c7a6c3261b819cfccbfb5a58e3e2ceff546327d271773c6c14
+	source = allow_elf64.patch
+	sha256sums = 8e040bc7556401ebb3a347a8f7878e9d4028cf71b2744b1a1699f4e741966ba8
 	sha256sums = SKIP
 	sha256sums = dd43e2ef062b071a0b9d0d5ea54737f41600ca8a84a8aefbebb1ff09f978acfb
 	sha256sums = c39bcde4a09165e64419fd2033b3532378bba84d509d39e2d51694d44c1f8d88
 	sha256sums = 60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7
+	sha256sums = 13a6d9e678bdc9e1f051006cfd0555f5a80582368f54c8a1bb5a78ece3832ac4
 
 pkgname = qemu-minimal
 
diff --git a/PKGBUILD b/PKGBUILD
index e0ff97ee369c..802fe657d38b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 284474 2016-12-22 23:27:55Z anatolik $
+# $Id: PKGBUILD 307136 2017-10-07 23:32:58Z anatolik $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sébastien "Seblu" Luttringer <seblu@seblu.net>
 
@@ -8,13 +8,13 @@
 pkgname='qemu-minimal'
 #pkgdesc="A generic and open source machine emulator and virtualizer"
 pkgdesc="A generic and open source machine emulator and virtualizer. This is a stripped-down version of the official package and requires only the bare essentials for running on a headless server."
-pkgver=2.9.0
+pkgver=2.10.1
 pkgrel=1
 arch=(i686 x86_64)
 license=(GPL2 LGPL2.1)
 url="http://wiki.qemu.org/"
 _headlessdeps=(seabios gnutls libpng libaio numactl jemalloc xfsprogs libnfs
-               lzo snappy curl vde2 libcap-ng spice usbredir)
+               lzo snappy curl vde2 libcap-ng spice libcacard usbredir)
 _minimaldeps=(seabios libaio jemalloc
               lzo snappy curl libcap-ng)
 #depends=(virglrenderer sdl2 vte3 brltty "${_headlessdeps[@]}")
@@ -25,12 +25,14 @@ conflicts=('qemu' 'qemu-headless')
 source=("$url/download/${pkgname:0:-8}-${pkgver}.tar.bz2"{,.sig}
         qemu.sysusers
         qemu-ga.service
-        65-kvm.rules)
-sha256sums=('00bfb217b1bb03c7a6c3261b819cfccbfb5a58e3e2ceff546327d271773c6c14'
+        65-kvm.rules
+        allow_elf64.patch)
+sha256sums=('8e040bc7556401ebb3a347a8f7878e9d4028cf71b2744b1a1699f4e741966ba8'
             'SKIP'
             'dd43e2ef062b071a0b9d0d5ea54737f41600ca8a84a8aefbebb1ff09f978acfb'
             'c39bcde4a09165e64419fd2033b3532378bba84d509d39e2d51694d44c1f8d88'
-            '60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7')
+            '60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7'
+            '13a6d9e678bdc9e1f051006cfd0555f5a80582368f54c8a1bb5a78ece3832ac4')
 validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584')
 
 case $CARCH in
@@ -45,6 +47,8 @@ prepare() {
 
   cd ${pkgname:0:-8}-${pkgver}
   sed -i 's/vte-2\.90/vte-2.91/g' configure
+
+  patch -p1 < ../allow_elf64.patch
 }
 
 build() {
diff --git a/allow_elf64.patch b/allow_elf64.patch
new file mode 100644
index 000000000000..07f27a038b1b
--- /dev/null
+++ b/allow_elf64.patch
@@ -0,0 +1,27 @@
+commit 3c72765ec760a51f0e879dc792be82c93141e318
+Author: Anatol Pomozov <anatol.pomozov@gmail.com>
+Date:   Tue Jun 6 20:07:03 2017 -0700
+
+    Remove restriction that prevents bootimg elf64 images
+    
+    It is possible to create a 64 bit elf image that has valid multiboot header.
+    qemu should be able to boot such images.
+    
+    Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
+
+diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
+index 663f35a658..cf1b4f5fb3 100644
+--- a/hw/i386/multiboot.c
++++ b/hw/i386/multiboot.c
+@@ -192,11 +192,6 @@ int load_multiboot(FWCfgState *fw_cfg,
+         int kernel_size;
+         fclose(f);
+ 
+-        if (((struct elf64_hdr*)header)->e_machine == EM_X86_64) {
+-            fprintf(stderr, "Cannot load x86-64 image, give a 32bit one.\n");
+-            exit(1);
+-        }
+-
+         kernel_size = load_elf(kernel_filename, NULL, NULL, &elf_entry,
+                                &elf_low, &elf_high, 0, I386_ELF_MACHINE,
+                                0, 0);