3a333345a6
Update to v4.2.0-rc3. Intent is to submit to Factory, and SLE-15-SP2 as well OBS-URL: https://build.opensuse.org/request/show/751303 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=513
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From: Andreas Schwab <schwab@suse.de>
|
|
Date: Fri, 12 Aug 2016 18:20:49 +0200
|
|
Subject: 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 246546b10ca5df38035e5ba46a09..e0666a3afdc81f0f8277a53f3e1e 100755
|
|
--- a/scripts/qemu-binfmt-conf.sh
|
|
+++ b/scripts/qemu-binfmt-conf.sh
|
|
@@ -266,7 +266,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() {
|
|
@@ -305,9 +305,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"
|