diff options
| author | Thomas Penteker <tek@serverop.de> | 2018-09-09 02:48:23 +0200 |
|---|---|---|
| committer | Thomas Penteker <tek@serverop.de> | 2018-09-09 02:48:23 +0200 |
| commit | 72e6dbca4a408c0aeb394e6efc8d4e4397f243ad (patch) | |
| tree | e5ac9075fb8e90192a425670e2eb80c97a8f6f73 /qemu | |
| parent | 992d754f5b8c75b4629be04244ab02b7501333f1 (diff) | |
| download | opt-72e6dbca4a408c0aeb394e6efc8d4e4397f243ad.tar.gz opt-72e6dbca4a408c0aeb394e6efc8d4e4397f243ad.tar.xz | |
qemu: 2.11.1 -> 3.0.0
Diffstat (limited to 'qemu')
| -rw-r--r-- | qemu/.footprint | 5 | ||||
| -rw-r--r-- | qemu/.signature | 9 | ||||
| -rw-r--r-- | qemu/Pkgfile | 7 | ||||
| -rw-r--r-- | qemu/memfd.patch | 26 |
4 files changed, 10 insertions, 37 deletions
diff --git a/qemu/.footprint b/qemu/.footprint index 65d5421b5..d0ef09ceb 100644 --- a/qemu/.footprint +++ b/qemu/.footprint @@ -10,6 +10,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/qemu-i386 -rwxr-xr-x root/root usr/bin/qemu-img -rwxr-xr-x root/root usr/bin/qemu-io +-rwxr-xr-x root/root usr/bin/qemu-keymap -rwxr-xr-x root/root usr/bin/qemu-nbd -rwxr-xr-x root/root usr/bin/qemu-pr-helper -rwxr-xr-x root/root usr/bin/qemu-system-i386 @@ -29,10 +30,10 @@ drwxr-xr-x root/root usr/share/man/man8/ drwxr-xr-x root/root usr/share/qemu/ -rw-r--r-- root/root usr/share/qemu/QEMU,cgthree.bin -rw-r--r-- root/root usr/share/qemu/QEMU,tcx.bin --rw-r--r-- root/root usr/share/qemu/acpi-dsdt.aml -rw-r--r-- root/root usr/share/qemu/bamboo.dtb -rw-r--r-- root/root usr/share/qemu/bios-256k.bin -rw-r--r-- root/root usr/share/qemu/bios.bin +-rw-r--r-- root/root usr/share/qemu/canyonlands.dtb -rw-r--r-- root/root usr/share/qemu/efi-e1000.rom -rw-r--r-- root/root usr/share/qemu/efi-e1000e.rom -rw-r--r-- root/root usr/share/qemu/efi-eepro100.rom @@ -41,6 +42,7 @@ drwxr-xr-x root/root usr/share/qemu/ -rw-r--r-- root/root usr/share/qemu/efi-rtl8139.rom -rw-r--r-- root/root usr/share/qemu/efi-virtio.rom -rw-r--r-- root/root usr/share/qemu/efi-vmxnet3.rom +-rw-r--r-- root/root usr/share/qemu/hppa-firmware.img drwxr-xr-x root/root usr/share/qemu/keymaps/ -rw-r--r-- root/root usr/share/qemu/keymaps/ar -rw-r--r-- root/root usr/share/qemu/keymaps/bepo @@ -106,6 +108,7 @@ drwxr-xr-x root/root usr/share/qemu/keymaps/ -rw-r--r-- root/root usr/share/qemu/slof.bin -rw-r--r-- root/root usr/share/qemu/spapr-rtas.bin -rw-r--r-- root/root usr/share/qemu/trace-events-all +-rw-r--r-- root/root usr/share/qemu/u-boot-sam460-20100605.bin -rw-r--r-- root/root usr/share/qemu/u-boot.e500 -rw-r--r-- root/root usr/share/qemu/vgabios-cirrus.bin -rw-r--r-- root/root usr/share/qemu/vgabios-qxl.bin diff --git a/qemu/.signature b/qemu/.signature index 7c69c5184..7ceb53947 100644 --- a/qemu/.signature +++ b/qemu/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cthKBC/z12LSxE3LOscfX5tPQ/mgQRIaIbBXtj22MbauG/5HKjA7jv/uqy4D4gDOqA2CBCx6zVPUhTC02io9QE= -SHA256 (Pkgfile) = 34eb4ad114ed4b9def63bc25947ae7b1bdd249cbdbf8237ba59d421acefc7e46 -SHA256 (.footprint) = 4a01c92a3584ac20d983f96cd5cdcd1824d8001b296b35689ee910644e232f22 -SHA256 (qemu-2.11.1.tar.bz2) = d9df2213ceed32e91dab7bc9dd19c1af83f91ba72c7aeef7605dfaaf81732ccb -SHA256 (memfd.patch) = 367acd86f6e0c020119d605830bc2eb1e02be1906f2ba58839893aa35c6054b3 +RWSE3ohX2g5d/ZAW4dw7PPBh2pnDB2A7SviejemX8hB1qO8FQDAihw8Wuv+YicEkBv2/hexXlDvSmHr9YYv+NX5v6LV+v/JkfQ8= +SHA256 (Pkgfile) = 572ffbfcb82f266d8f03b7c3e7bb3c5a574d568a8cd4a09193fbac29288f63f8 +SHA256 (.footprint) = 5c4cc8efc02a96a661f52be0905dc16d1f4bb373cdbc82f6c33623973f9de1df +SHA256 (qemu-3.0.0.tar.bz2) = 933e62ad604f5f8d0a93f5e0a98fd95f9d2e23ff1dbd0c744c6c7506bba8ebe8 diff --git a/qemu/Pkgfile b/qemu/Pkgfile index d47316093..5e076b1a6 100644 --- a/qemu/Pkgfile +++ b/qemu/Pkgfile @@ -5,17 +5,14 @@ # Optional: libseccomp libiscsi libusb usbredir spice name=qemu -version=2.11.1 +version=3.0.0 release=1 -source=(http://wiki.qemu-project.org/download/qemu-$version.tar.bz2 \ - memfd.patch) +source=(http://wiki.qemu-project.org/download/qemu-$version.tar.bz2) build() { cd $name-$version - patch -p1 -i $SRC/memfd.patch - ./configure --prefix=/usr \ --cc="${CC:=gcc}" \ --host-cc="${CC:=gcc}" \ diff --git a/qemu/memfd.patch b/qemu/memfd.patch deleted file mode 100644 index 9ff848460..000000000 --- a/qemu/memfd.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -rupN qemu-2.10.1-orig/configure qemu-2.10.1/configure ---- qemu-2.10.1-orig/configure 2018-02-03 20:31:28.775201548 +0100 -+++ qemu-2.10.1/configure 2018-02-03 20:49:55.690456630 +0100 -@@ -3855,7 +3855,7 @@ fi - # check if memfd is supported - memfd=no - cat > $TMPC << EOF --#include <sys/memfd.h> -+#include <sys/mman.h> - - int main(void) - { -diff -rupN qemu-2.10.1-orig/util/memfd.c qemu-2.10.1/util/memfd.c ---- qemu-2.10.1-orig/util/memfd.c 2018-02-03 20:31:29.058197629 +0100 -+++ qemu-2.10.1/util/memfd.c 2018-02-03 20:50:33.589907638 +0100 -@@ -31,9 +31,7 @@ - - #include "qemu/memfd.h" - --#ifdef CONFIG_MEMFD --#include <sys/memfd.h> --#elif defined CONFIG_LINUX -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD - #include <sys/syscall.h> - #include <asm/unistd.h> - |