qemu: port musl patch to new version (#46449)

authored by

Will Dietz and committed by
xeji
8fc2799e b7c0e407

+31 -4
+1 -4
pkgs/applications/virtualization/qemu/default.nix
··· 84 84 url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch; 85 85 sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k"; 86 86 }) 87 - (fetchpatch { 88 - url = https://raw.githubusercontent.com/alpinelinux/aports/61a7a1b77a868e3b940c0b25e6c2b2a6c32caf20/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch; 89 - sha256 = "1ar6r1vpmhnbs72v6mhgyahcjcf7b9b4xi7asx17sy68m171d2g6"; 90 - }) 87 + ./sigrtminmax.patch 91 88 (fetchpatch { 92 89 url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch; 93 90 sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav";
+30
pkgs/applications/virtualization/qemu/sigrtminmax.patch
··· 1 + From 2697fcc42546e814a2d2617671cb8398b15256fb Mon Sep 17 00:00:00 2001 2 + From: Will Dietz <w@wdtz.org> 3 + Date: Fri, 17 Aug 2018 00:22:35 -0500 4 + Subject: [PATCH] quick port __SIGRTMIN/__SIGRTMAX patch for qemu 3.0 5 + 6 + --- 7 + linux-user/signal.c | 7 +++++++ 8 + 1 file changed, 7 insertions(+) 9 + 10 + diff --git a/linux-user/signal.c b/linux-user/signal.c 11 + index 602b631b92..87f9240134 100644 12 + --- a/linux-user/signal.c 13 + +++ b/linux-user/signal.c 14 + @@ -26,6 +26,13 @@ 15 + #include "trace.h" 16 + #include "signal-common.h" 17 + 18 + +#ifndef __SIGRTMIN 19 + +#define __SIGRTMIN 32 20 + +#endif 21 + +#ifndef __SIGRTMAX 22 + +#define __SIGRTMAX (NSIG-1) 23 + +#endif 24 + + 25 + struct target_sigaltstack target_sigaltstack_used = { 26 + .ss_sp = 0, 27 + .ss_size = 0, 28 + -- 29 + 2.18.0 30 +