672f70aa3d
Update to 2.11.1, plus a few other fixes. OBS-URL: https://build.opensuse.org/request/show/579209 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=392
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From 467907dc59bb7b955d78f37a190958cbb4cc837d 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 5c3ba942ec..bb29213fa5 100755
|
|
--- a/scripts/qemu-binfmt-conf.sh
|
|
+++ b/scripts/qemu-binfmt-conf.sh
|
|
@@ -206,7 +206,7 @@ qemu_check_systemd() {
|
|
}
|
|
|
|
qemu_generate_register() {
|
|
- echo ":qemu-$cpu:M::$magic:$mask:$qemu:$FLAGS"
|
|
+ echo ":qemu-$cpu:M::$magic:$mask:$qemu:P$FLAGS"
|
|
}
|
|
|
|
qemu_register_interpreter() {
|
|
@@ -247,9 +247,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
|
|
|
|
if [ "$host_family" != "$family" ] ; then
|