fbc8207b73
Update to qemu 3.1.0-rc5. Is almost certainly the last rc, so should be same as 3.1.0 final. Putting into devel project 'early' because of SLE and Leap needs, not to get into Factory early. Look for the final 3.1 within a week. OBS-URL: https://build.opensuse.org/request/show/655897 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=433
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From a7d4245659644e5efd908004c1b47eedc456abef Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schwab <schwab@suse.de>
|
|
Date: Fri, 12 Aug 2016 18:20:49 +0200
|
|
Subject: [PATCH] qemu-binfmt-conf: use qemu-ARCH-binfmt
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Andreas Schwab <schwab@suse.de>
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
scripts/qemu-binfmt-conf.sh | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
|
|
index 4f1358e2fd..13add7775e 100755
|
|
--- a/scripts/qemu-binfmt-conf.sh
|
|
+++ b/scripts/qemu-binfmt-conf.sh
|
|
@@ -262,7 +262,7 @@ qemu_generate_register() {
|
|
flags="${flags}F"
|
|
fi
|
|
|
|
- echo ":qemu-$cpu:M::$magic:$mask:$qemu:$flags"
|
|
+ echo ":qemu-$cpu:M::$magic:$mask:$qemu:P$flags"
|
|
}
|
|
|
|
qemu_register_interpreter() {
|
|
@@ -301,9 +301,9 @@ qemu_set_binfmts() {
|
|
continue
|
|
fi
|
|
|
|
- qemu="$QEMU_PATH/qemu-$cpu"
|
|
+ qemu="$QEMU_PATH/qemu-$cpu-binfmt"
|
|
if [ "$cpu" = "i486" ] ; then
|
|
- qemu="$QEMU_PATH/qemu-i386"
|
|
+ qemu="$QEMU_PATH/qemu-i386-binfmt"
|
|
fi
|
|
|
|
qemu="$qemu$QEMU_SUFFIX"
|