- Update emulators/qemu-sbruno to latest github snapshot, fixing

  the bsd-user targets on 8 and 9.
- Switch emulators/qemu-user-static to be slave of emulators/qemu-sbruno.
- Update emulators/qemu-devel to latest upstream release 2.2.0, now
  w/o bsd-user patches and knob again.  (Or at least until the
  patches are merged upstream...) [1]
- Add appropriate CONFLICTS to emulators/qemu too and bump its
  PORTREVISION.

Suggested by:	andrew [1] (for the benefit of testing aarch64 guests)

1 files changed, 0 insertions, 37 deletions

diff --git a/emulators/qemu-devel/files/extra-patch-target_siginfo b/emulators/qemu-devel/files/extra-patch-target_siginfo
deleted file mode 100644
index 4058f191eed9..000000000000
--- a/emulators/qemu-devel/files/extra-patch-target_siginfo
+++ /dev/null
@@ -1,37 +0,0 @@
-From nox Mon Sep 17 00:00:00 2001
-From: Juergen Lock <nox@jelal.kn-bremen.de>
-Date: 22 Jun 2014 00:52:23 +0200
-Subject: Fix bsd-user default TARGET_SIGINFO handling
-
-TARGET_SIGINFO doesn't kill the process and also doesn't cause EINTR
-by default so add it to fatal_signal() appropriately; and also don't
-call force_sig() on it should it end up being handled.
-
-Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>
-
---- a/bsd-user/signal.c
-+++ b/bsd-user/signal.c
-@@ -391,6 +391,7 @@ int queue_signal(CPUArchState *env, int 
-             if (sig != TARGET_SIGCHLD &&
-                 sig != TARGET_SIGURG &&
-                 sig != TARGET_SIGWINCH &&
-+                sig != TARGET_SIGINFO &&
-                 sig != TARGET_SIGCONT) {
-                 force_sig(sig);
-             } else {
-@@ -531,6 +532,7 @@ static int fatal_signal(int sig)
-     case TARGET_SIGCHLD:
-     case TARGET_SIGURG:
-     case TARGET_SIGWINCH:
-+    case TARGET_SIGINFO:
-         /* Ignored by default. */
-         return 0;
-     case TARGET_SIGCONT:
-@@ -884,6 +886,7 @@ handle_signal:
-                 TARGET_SIGTTOU == sig) {
-             kill(getpid(), SIGSTOP);
-         } else if (TARGET_SIGCHLD != sig && TARGET_SIGURG != sig &&
-+            TARGET_SIGINFO != sig &&
-             TARGET_SIGWINCH != sig && TARGET_SIGCONT != sig) {
-             force_sig(sig);
-         }