aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-04-22 11:46:12 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-04-22 11:46:26 +0000
commit1b13a146f9e780a7bc85190b6c4ae485b86fa6d6 (patch)
treed879e1168e65bace58ff29dcf7529a5921f2ef27
parent8a2f32ea1667a86d24eb6b2b5536e04e3713d7a6 (diff)
downloadaports-1b13a146f9e780a7bc85190b6c4ae485b86fa6d6.tar.gz
aports-1b13a146f9e780a7bc85190b6c4ae485b86fa6d6.tar.bz2
aports-1b13a146f9e780a7bc85190b6c4ae485b86fa6d6.tar.xz
main/qemu: upgrade to 2.0.0
-rw-r--r--main/qemu/APKBUILD18
-rw-r--r--main/qemu/sigev_pad.patch18
-rw-r--r--main/qemu/uclibc-xattr-create.patch16
3 files changed, 28 insertions, 24 deletions
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD
index 1743333ef5..e444ff8a86 100644
--- a/main/qemu/APKBUILD
+++ b/main/qemu/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qemu
-pkgver=1.7.1
+pkgver=2.0.0
pkgrel=0
pkgdesc="QEMU is a generic machine emulator and virtualizer"
url="http://qemu.org/"
@@ -37,6 +37,7 @@ $pkgname-sh4eb:sh4eb
$pkgname-sparc:sparc
$pkgname-sparc32plus:sparc32plus
$pkgname-sparc64:sparc64
+$pkgname-system-aarch64:system_aarch64
$pkgname-system-alpha:system_alpha
$pkgname-system-arm:system_arm
$pkgname-system-cris:system_cris
@@ -76,7 +77,7 @@ source="http://wiki.qemu-project.org/download/qemu-$pkgver.tar.bz2
qemu-170-ffsll.patch
qemu-170-openpty.patch
qemu-170-sigset_t.patch
- uclibc-xattr-create.patch
+ sigev_pad.patch
qemu-guest-agent.confd
qemu-guest-agent.initd
@@ -178,6 +179,7 @@ sh4eb() { _subsys sh4eb; }
sparc() { _subsys sparc; }
sparc32plus() { _subsys sparc32plus; }
sparc64() { _subsys sparc64; }
+system_aarch64() { _subsys system-aarch64; }
system_alpha() { _subsys system-alpha; }
system_arm() { _subsys system-arm; }
system_cris() { _subsys system-cris; }
@@ -238,33 +240,33 @@ guest() {
"$subpkgdir"/etc/conf.d/qemu-guest-agent || return 1
}
-md5sums="9541063d999cf9659ed7fdce71314f31 qemu-1.7.1.tar.bz2
+md5sums="2790f44fd76da5de5024b4aafeb594c2 qemu-2.0.0.tar.bz2
672727bb1d8c8ab7b5def65dd1793c33 0001-elfload-load-PIE-executables-to-right-address.patch
a51a526312535019de143f2e6a54e3ce qemu-170-ffsl.patch
78f4d1b13ddee47887b6d59378e8e44e qemu-170-ffsll.patch
6589d3ba6975d245feefa0ad436eed76 qemu-170-openpty.patch
f5e8ee9c5cd1ebc37194f3c151f420a8 qemu-170-sigset_t.patch
-1d317f1b54eb88391e28a62eabb97660 uclibc-xattr-create.patch
+3fed185b1f49f9da4fd1011cba8122fb sigev_pad.patch
1663bc6977f6886a58394155b1bf3676 qemu-guest-agent.confd
2035cd781ea810e94bda250c609d8d90 qemu-guest-agent.initd
66660f143235201249dc0648b39b86ee 80-kvm.rules"
-sha256sums="d68942a004222eebae5d156ceefb308fabd98edb282d1dde49ec810bbf01bef4 qemu-1.7.1.tar.bz2
+sha256sums="60cc1aa0cad39cec891f970bed60ca8a484f071adad4943123599ac223543a3b qemu-2.0.0.tar.bz2
af35304b165622a53f7557b59ffd8da5030f5fd444e669c862f9410131f3b987 0001-elfload-load-PIE-executables-to-right-address.patch
63adefe8f34a6859e5f7a1e2de49538267c93955231ef0c4c2bfd6de919711e0 qemu-170-ffsl.patch
373ca5c783913645c6fc6c4c3b7740b0cc011aeed30bc8b848d5b26cf5d81070 qemu-170-ffsll.patch
6cffdccc3e270e7ab65701cc4e68692b577540f02763b14c66bf2225edb20f8b qemu-170-openpty.patch
fbc907e09c04110992a75bd4cc2f74fbc33e5b4a1cf0ebaa51c2a1dc4512ce5c qemu-170-sigset_t.patch
-fa8e174c57c58483f2798b249c4aad967a705498936be0d87c2944174c0b645e uclibc-xattr-create.patch
+35f082690682229166641640d1abeaabfe67ad61b829ab62d94ccb3ef0aaea81 sigev_pad.patch
d84e53a94584f37f3bd1b21f44077b5de0d07094c6729f26ae20ab1f7b9cc298 qemu-guest-agent.confd
982fa8ba67c728405305e4cf5a36a41a780b3d1f388ebd6377e7964c271a1c92 qemu-guest-agent.initd
37f666f1cdb7d8a62171de69b531681dcb0fba74236729dac8b6c019232eba84 80-kvm.rules"
-sha512sums="deaa209d85b10465a69a0ffffefe1987723bb242cef64d7344adfed5de08e48f53f6096e83821a9d1221df392e3a43b44b666a86aa4fa26d3d95ba631676947b qemu-1.7.1.tar.bz2
+sha512sums="8fe2e8faa66251aaea7d6017ee71675d5b05f93f92be7e2ad3e1d02af185b3d6c4069bd83a13fb1e35a3e8947aff76f22446b395f97ac18b6f7a99744202e3fa qemu-2.0.0.tar.bz2
405008589cad1c8b609eca004d520bf944366e8525f85a19fc6e283c95b84b6c2429822ba064675823ab69f1406a57377266a65021623d1cd581e7db000134fd 0001-elfload-load-PIE-executables-to-right-address.patch
13ac2ba2835764ad97d55dc62313a4626a4e4e12a5f932d26b8579101bd875411faf9ffd5642c94e7b8da7d41b5ca48507c3a08ce4d087b8306110e23206877e qemu-170-ffsl.patch
80168f5eadb518dbae8277cc2ff78cc494783e2180dfbf78d7b5c068c3efecd0bbb3d61dfb0079e365c632c1a80b82d6955de9718ff0b8e8613a52407bd5a2af qemu-170-ffsll.patch
b2cbb121c8ac85ee0aff835ecff59e2b4e886ddb9c5084286eaf735b5a3868043dad36e5e2289b6e6505bca4cfe971c9a35109a3638357d4b5b10168f921c984 qemu-170-openpty.patch
d867db00b0ac83c8dabd45c9ef0f07559f1f2045f3a4b7fd507a1ee276325e693f772b22511e2d5e1fce866de0ef4cd9da057119cfc39b905471a8995b36619e qemu-170-sigset_t.patch
-2e2ef2d5eb313f5bc89c11622278dfc67075a0eca8492e866cd8d9d4cf1171304c23822ed581b89ad36f951787cca858cb640cc8d7f3246f5f29861fc316c4e0 uclibc-xattr-create.patch
+51e66ac6eb649a165e5633c00d295740dc11f73ffa7567931b7d416f210154c2a51eb4b967c6d849ad9f6b19581c8e452b32da55f05982de37de7b8ce3c1edae sigev_pad.patch
d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f qemu-guest-agent.confd
761b4e2397569dae45ae3bb9e46e28746275297f629af9e9065525497fd26a48b65d8abcf4282727afd35309e338967acf6a1b14c3169577bdc16c1f42e618b3 qemu-guest-agent.initd
9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2 80-kvm.rules"
diff --git a/main/qemu/sigev_pad.patch b/main/qemu/sigev_pad.patch
new file mode 100644
index 0000000000..19f2cec099
--- /dev/null
+++ b/main/qemu/sigev_pad.patch
@@ -0,0 +1,18 @@
+--- ./linux-user/syscall_defs.h.orig
++++ ./linux-user/syscall_defs.h
+@@ -2552,12 +2552,14 @@
+ abi_ulong ptr;
+ };
+
++#define SIGEV_PAD_ARRAY_SIZE ARRAY_SIZE(((struct sigevent *)0)->__pad)
++
+ struct target_sigevent {
+ target_sigval_t sigev_value;
+ int32_t sigev_signo;
+ int32_t sigev_notify;
+ union {
+- int32_t _pad[ARRAY_SIZE(((struct sigevent *)0)->_sigev_un._pad)];
++ int32_t _pad[SIGEV_PAD_ARRAY_SIZE];
+ int32_t _tid;
+
+ struct {
diff --git a/main/qemu/uclibc-xattr-create.patch b/main/qemu/uclibc-xattr-create.patch
deleted file mode 100644
index 53cc1dfe23..0000000000
--- a/main/qemu/uclibc-xattr-create.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./include/qemu/xattr.h.orig
-+++ ./include/qemu/xattr.h
-@@ -24,6 +24,13 @@
- # include <attr/xattr.h>
- #else
- # define ENOATTR ENODATA
-+/* workaround for uclibc */
-+# ifdef XATTR_CREATE
-+# undef XATTR_CREATE
-+# endif
-+# ifdef XATTR_REPLACE
-+# undef XATTR_REPLACE
-+# endif
- # include <sys/xattr.h>
- #endif
-