jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7559 from arete/qemu

Browse source 
qemu: update to 2.10.0
This commit is contained in:
Enno Boland 2017-09-04 12:44:56 +02:00 committed by GitHub
commit 43576c3705
2 changed files with 3 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
srcpkgs/qemu/patches/glibc-2.26.patch
View file

@ -1,71 +0,0 @@
--- linux-user/host/x86_64/hostdep.h.orig 2017-04-20 14:57:00.000000000 +0000
+++ linux-user/host/x86_64/hostdep.h 2017-08-05 19:20:26.844765070 +0000
@@ -24,7 +24,7 @@
/* Adjust the signal context to rewind out of safe-syscall if we're in it */
static inline void rewind_if_in_safe_syscall(void *puc)
{
- struct ucontext *uc = puc;
+ ucontext_t *uc = puc;
greg_t *pcreg = &uc->uc_mcontext.gregs[REG_RIP];
if (*pcreg > (uintptr_t)safe_syscall_start
--- user-exec.c.orig 2017-04-20 14:57:01.000000000 +0000
+++ user-exec.c 2017-08-05 19:25:50.462745781 +0000
@@ -162,7 +162,7 @@
void *puc)
{
siginfo_t *info = pinfo;
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__linux__)
ucontext_t *uc = puc;
#elif defined(__OpenBSD__)
struct sigcontext *uc = puc;
{
siginfo_t *info = pinfo;
unsigned long pc;
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__linux__)
ucontext_t *uc = puc;
#elif defined(__OpenBSD__)
struct sigcontext *uc = puc;
--- linux-user/signal.c.orig 2017-04-20 14:57:00.000000000 +0000
@@ -3949,7 +3948,7 @@
siginfo_t *pinfo;
void *puc;
siginfo_t info;
- struct ucontext uc;
+ ucontext_t uc;
uint16_t retcode[4]; /* Trampoline code. */
};
--- linux-user/signal.c.orig 2017-04-20 14:57:00.000000000 +0000
+++ linux-user/signal.c 2017-08-05 19:30:35.080728816 +0000
@@ -3733,7 +3725,7 @@
struct rt_signal_frame {
siginfo_t info;
- struct ucontext uc;
+ ucontext_t uc;
uint32_t tramp[2];
};
@@ -3949,7 +3941,7 @@
siginfo_t *pinfo;
void *puc;
siginfo_t info;
- struct ucontext uc;
+ ucontext_t uc;
uint16_t retcode[4]; /* Trampoline code. */
};
--- user-exec.c.orig 2017-08-05 19:36:25.000000000 +0000
+++ user-exec.c 2017-08-05 19:41:52.304688451 +0000
@@ -217,7 +217,7 @@
{
siginfo_t *info = pinfo;
unsigned long pc;
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__linux__)
ucontext_t *uc = puc;
#elif defined(__OpenBSD__)
struct sigcontext *uc = puc;

6
srcpkgs/qemu/template
View file

@ -1,13 +1,13 @@
# Template file for 'qemu'
pkgname=qemu
version=2.9.0
revision=3
version=2.10.0
revision=1
short_desc="Open Source Processor Emulator"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://qemu.org"
license="GPL-2, LGPL-2.1"
distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2"
checksum=00bfb217b1bb03c7a6c3261b819cfccbfb5a58e3e2ceff546327d271773c6c14
checksum=7e9f39e1306e6dcc595494e91c1464d4b03f55ddd2053183e0e1b69f7f776d48
nocross="https://api.travis-ci.org/jobs/210268003/log.txt"
nostrip=yes