diff options
| author | Will Dietz <github@wdtz.org> | 2018-09-10 01:14:37 -0500 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-10 08:14:37 +0200 |
| commit | 8fc2799e02975c7f44c761db6959af9804478649 (patch) | |
| tree | 4d7e3dd9faf54a6b84061015bea59ad63c79915f /pkgs/applications/virtualization | |
| parent | b7c0e4079646ad816366754283f06d872de2b219 (diff) | |
| download | nixpkgs-8fc2799e02975c7f44c761db6959af9804478649.tar nixpkgs-8fc2799e02975c7f44c761db6959af9804478649.tar.gz nixpkgs-8fc2799e02975c7f44c761db6959af9804478649.tar.bz2 nixpkgs-8fc2799e02975c7f44c761db6959af9804478649.tar.lz nixpkgs-8fc2799e02975c7f44c761db6959af9804478649.tar.xz nixpkgs-8fc2799e02975c7f44c761db6959af9804478649.tar.zst nixpkgs-8fc2799e02975c7f44c761db6959af9804478649.zip | |
qemu: port musl patch to new version (#46449)
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/qemu/sigrtminmax.patch | 30 |
2 files changed, 31 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index bbb2a099666..596bc9dd9e0 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -84,10 +84,7 @@ stdenv.mkDerivation rec { url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch; sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k"; }) - (fetchpatch { - url = https://raw.githubusercontent.com/alpinelinux/aports/61a7a1b77a868e3b940c0b25e6c2b2a6c32caf20/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch; - sha256 = "1ar6r1vpmhnbs72v6mhgyahcjcf7b9b4xi7asx17sy68m171d2g6"; - }) + ./sigrtminmax.patch (fetchpatch { url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch; sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav"; diff --git a/pkgs/applications/virtualization/qemu/sigrtminmax.patch b/pkgs/applications/virtualization/qemu/sigrtminmax.patch new file mode 100644 index 00000000000..41050447ac6 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/sigrtminmax.patch @@ -0,0 +1,30 @@ +From 2697fcc42546e814a2d2617671cb8398b15256fb Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Fri, 17 Aug 2018 00:22:35 -0500 +Subject: [PATCH] quick port __SIGRTMIN/__SIGRTMAX patch for qemu 3.0 + +--- + linux-user/signal.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/linux-user/signal.c b/linux-user/signal.c +index 602b631b92..87f9240134 100644 +--- a/linux-user/signal.c ++++ b/linux-user/signal.c +@@ -26,6 +26,13 @@ + #include "trace.h" + #include "signal-common.h" + ++#ifndef __SIGRTMIN ++#define __SIGRTMIN 32 ++#endif ++#ifndef __SIGRTMAX ++#define __SIGRTMAX (NSIG-1) ++#endif ++ + struct target_sigaltstack target_sigaltstack_used = { + .ss_sp = 0, + .ss_size = 0, +-- +2.18.0 + |