2016-09-19 19:06:58 +02:00
|
|
|
From: Andreas Schwab <schwab@suse.de>
|
|
|
|
Date: Fri, 12 Aug 2016 18:20:49 +0200
|
2019-01-04 22:08:16 +01:00
|
|
|
Subject: qemu-binfmt-conf: use qemu-ARCH-binfmt
|
2016-09-19 19:06:58 +02:00
|
|
|
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
|
2019-09-12 17:54:03 +02:00
|
|
|
index 4f1358e2fd8c0da34cf06a763ca8..13add7775eb7d24c52735b02cd51 100755
|
2016-09-19 19:06:58 +02:00
|
|
|
--- a/scripts/qemu-binfmt-conf.sh
|
|
|
|
+++ b/scripts/qemu-binfmt-conf.sh
|
2018-12-06 22:20:59 +01:00
|
|
|
@@ -262,7 +262,7 @@ qemu_generate_register() {
|
2018-08-22 16:58:18 +02:00
|
|
|
flags="${flags}F"
|
|
|
|
fi
|
2016-09-19 19:06:58 +02:00
|
|
|
|
2018-08-22 16:58:18 +02:00
|
|
|
- echo ":qemu-$cpu:M::$magic:$mask:$qemu:$flags"
|
|
|
|
+ echo ":qemu-$cpu:M::$magic:$mask:$qemu:P$flags"
|
2016-09-19 19:06:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
qemu_register_interpreter() {
|
2018-12-06 22:20:59 +01:00
|
|
|
@@ -301,9 +301,9 @@ qemu_set_binfmts() {
|
2016-09-19 19:06:58 +02:00
|
|
|
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
|
|
|
|
|
2018-08-22 16:58:18 +02:00
|
|
|
qemu="$qemu$QEMU_SUFFIX"
|