summaryrefslogtreecommitdiff
path: root/qemu-all
diff options
context:
space:
mode:
authorThomas Penteker <tek@serverop.de>2014-04-18 00:27:57 +0200
committerThomas Penteker <tek@serverop.de>2014-04-18 00:27:57 +0200
commit0775e5796f73af99b92a3594d40bf942d5f672cc (patch)
treebad9046fa31f5f9fc4ce9cf4261c2592feaf0fff /qemu-all
parentb752a4b08d2e4d336a759557c62b36b3804c9e81 (diff)
downloadopt-0775e5796f73af99b92a3594d40bf942d5f672cc.tar.gz
opt-0775e5796f73af99b92a3594d40bf942d5f672cc.tar.xz
qemu-all: 1.7.1 -> 2.0.0
Diffstat (limited to 'qemu-all')
-rw-r--r--qemu-all/.footprint4
-rw-r--r--qemu-all/.md5sum3
-rw-r--r--qemu-all/Pkgfile8
-rw-r--r--qemu-all/ide-smart.diff13
4 files changed, 8 insertions, 20 deletions
diff --git a/qemu-all/.footprint b/qemu-all/.footprint
index 570144f52..5b94c0247 100644
--- a/qemu-all/.footprint
+++ b/qemu-all/.footprint
@@ -3,6 +3,7 @@ drwxr-xr-x root/root etc/qemu/
-rw-r--r-- root/root etc/qemu/target-x86_64.conf (EMPTY)
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
+-rwxr-xr-x root/root usr/bin/qemu-aarch64
-rwxr-xr-x root/root usr/bin/qemu-alpha
-rwxr-xr-x root/root usr/bin/qemu-arm
-rwxr-xr-x root/root usr/bin/qemu-armeb
@@ -31,6 +32,7 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/qemu-sparc
-rwxr-xr-x root/root usr/bin/qemu-sparc32plus
-rwxr-xr-x root/root usr/bin/qemu-sparc64
+-rwxr-xr-x root/root usr/bin/qemu-system-aarch64
-rwxr-xr-x root/root usr/bin/qemu-system-alpha
-rwxr-xr-x root/root usr/bin/qemu-system-arm
-rwxr-xr-x root/root usr/bin/qemu-system-cris
@@ -71,9 +73,11 @@ drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/qemu-nbd.8.gz
drwxr-xr-x root/root usr/share/
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/efi-e1000.rom
-rw-r--r-- root/root usr/share/qemu/efi-eepro100.rom
diff --git a/qemu-all/.md5sum b/qemu-all/.md5sum
index a1745ce34..134a3330c 100644
--- a/qemu-all/.md5sum
+++ b/qemu-all/.md5sum
@@ -1,2 +1 @@
-0afe916c82b3ec2ed4ff8ee2590c0f5c ide-smart.diff
-9541063d999cf9659ed7fdce71314f31 qemu-1.7.1.tar.bz2
+2790f44fd76da5de5024b4aafeb594c2 qemu-2.0.0.tar.bz2
diff --git a/qemu-all/Pkgfile b/qemu-all/Pkgfile
index 9f4b0087d..ddad8d1bc 100644
--- a/qemu-all/Pkgfile
+++ b/qemu-all/Pkgfile
@@ -6,15 +6,13 @@
# Nice to have: libseccomp libiscsi
name=qemu-all
-version=1.7.1
-release=2
-source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2 ide-smart.diff)
+version=2.0.0
+release=1
+source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2)
build() {
cd qemu-$version
- patch -p1 -i $SRC/ide-smart.diff
-
./configure --prefix=/usr \
--cc="${CC:=gcc}" \
--host-cc="${CC:=gcc}" \
diff --git a/qemu-all/ide-smart.diff b/qemu-all/ide-smart.diff
deleted file mode 100644
index 0d3cdeb2d..000000000
--- a/qemu-all/ide-smart.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/hw/ide/core.c b/hw/ide/core.c
-index e1dfe54..c943a4d 100644
---- a/hw/ide/core.c
-+++ b/hw/ide/core.c
-@@ -1602,7 +1602,7 @@ static bool cmd_smart(IDEState *s, uint8_t cmd)
- case 2: /* extended self test */
- s->smart_selftest_count++;
- if (s->smart_selftest_count > 21) {
-- s->smart_selftest_count = 0;
-+ s->smart_selftest_count = 1;
- }
- n = 2 + (s->smart_selftest_count - 1) * 24;
- s->smart_selftest_data[n] = s->sector;

Generated by cgit