diff options
| author | Pavel Kopyl <p.kopyl@samsung.com> | 2016-08-23 13:42:07 +0000 |
|---|---|---|
| committer | Pavel Kopyl <p.kopyl@samsung.com> | 2016-09-01 14:34:08 +0000 |
| commit | e6e4b17e5521d7da23543e1b680d6bb75d4510e7 (patch) | |
| tree | 5ddfdf3a173f834cbce52785fc47a7efdaaae2f9 | |
| parent | 273e681f8f5c851b8b52ddc6d86002e079c6f2da (diff) | |
| download | qemu-e6e4b17e5521d7da23543e1b680d6bb75d4510e7.tar.gz qemu-e6e4b17e5521d7da23543e1b680d6bb75d4510e7.tar.bz2 qemu-e6e4b17e5521d7da23543e1b680d6bb75d4510e7.zip | |
Use different names for qemu-user binary:sandbox/pavelkopyl/bitness_suffix
1. qemu-linux-user-x86_64-cross for 64-bit.
2. qemu-linux-user-x86-cross for 32-bit.
Change-Id: Ib2487b82c57189942e0925427cb2144dc8817dec
Signed-off-by: Pavel Kopyl <p.kopyl@samsung.com>
| -rw-r--r-- | packaging/baselibs.conf | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf index b50ee4740..4f8417acf 100644 --- a/packaging/baselibs.conf +++ b/packaging/baselibs.conf @@ -1,9 +1,29 @@ -arch i586 targets armv7l:cross aarch64:cross -arch i686 targets armv7l:cross aarch64:cross -arch x86_64 targets armv7l:cross aarch64:cross +arch i586 targets armv7l:x86-cross aarch64:x86-cross +arch i686 targets armv7l:x86-cross aarch64:x86-cross +arch x86_64 targets armv7l:x86_64-cross aarch64:x86_64-cross -targettype cross package qemu-linux-user - autoreqprov off +targettype x86_64-cross package qemu-linux-user + autoreqprov off + +/ + post "function setbinfmt () {" + post " local arch=$1" + post " local fmt=$2" + post " local comp_fmt=$(echo ${fmt} | sed -e 's/.*:://;s/:[^:]$//;s/\\x//g')" + post " local curr_fmt=$(cat /proc/sys/fs/binfmt_misc/${arch} | sed -ne '/interpreter/{s/interpreter //;h};/magic/{s/magic //;H};/mask/{s/mask //;G;s/\([^\n]*\)\n\([^\n]*\)\n\([^\n]*\)/\3:\1:\2/p}')" + post " if ( [ ! -e "/proc/sys/fs/binfmt_misc/${arch}" ] || [ "x${comp_fmt}" != "x${curr_fmt}" ] ); then" + post " builtin echo -1 > "/proc/sys/fs/binfmt_misc/${arch}"" + post " builtin echo "${fmt}" > /proc/sys/fs/binfmt_misc/register" + post " fi" + post "}" + post "[ ! -d /proc/sys/fs/binfmt_misc ] && ( /sbin/modprobe binfmt_misc )" + post "[ ! -f /proc/sys/fs/binfmt_misc/register ] && ( mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc )" + post "[ -e /proc/sys/fs/binfmt_misc/arm64 ] && ( builtin echo -1 > /proc/sys/fs/binfmt_misc/arm64 )" + post "setbinfmt 'arm' ':arm:M::\x7f\x45\x4c\x46\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-binfmt:P' " + post "setbinfmt 'armeb' ':armeb:M::\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb-binfmt:P'" + post "setbinfmt 'aarch64' ':aarch64:M::\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-aarch64-binfmt:P'" + +targettype x86-cross package qemu-linux-user + autoreqprov off +/ post "function setbinfmt () {" post " local arch=$1" |