diff --git a/scripts/common.sh b/scripts/common.sh index 6432a09531b6..017111a12917 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -66,6 +66,8 @@ function remove_tls_patch() function emulate_arm() { + echo qemu-arm-static as ARM interpreter to the kernel + echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:' > /proc/sys/fs/binfmt_misc/register echo Copying ARM QEMU binary if [ "$2" == "32" ]; then ARM_EMULATOR="qemu-arm-static"; fi if [ "$2" == "64" ]; then ARM_EMULATOR="qemu-aarch64-static"; fi diff --git a/toolchains/armv7-toolchain-osmc/DEBIAN/control b/toolchains/armv7-toolchain-osmc/DEBIAN/control index fc8569c44854..6b459f72da5b 100644 --- a/toolchains/armv7-toolchain-osmc/DEBIAN/control +++ b/toolchains/armv7-toolchain-osmc/DEBIAN/control @@ -4,7 +4,7 @@ Version: 11.0.0-5 Section: tools Essential: No Priority: optional -Depends: qemu, binfmt-support, qemu-user-static +Depends: qemu-system, binfmt-support, qemu-user-static Architecture: all Maintainer: Sam G Nazarko Description: OSMC toolchain for ARMv7 diff --git a/toolchains/armv7-toolchain-osmc/build.sh b/toolchains/armv7-toolchain-osmc/build.sh index 2ddf4b843531..9d7f89004374 100755 --- a/toolchains/armv7-toolchain-osmc/build.sh +++ b/toolchains/armv7-toolchain-osmc/build.sh @@ -2,7 +2,6 @@ # email@samnazarko.co.uk #!/bin/bash - . ../common/funcs.sh wd=$(pwd) tcstub="armv7-toolchain-osmc" @@ -19,7 +18,7 @@ verify_action packages="debootstrap dh-make devscripts -qemu +qemu-system binfmt-support qemu-user-static" for package in $packages