From 34002924411eece399867bc0ace8d9673b3ea13d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan-Simon=20M=C3=B6ller?= Date: Fri, 26 Mar 2010 16:50:23 +0100 Subject: [PATCH] Additional changes to support mips and ppc/ppc64 emulation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Mohring Signed-off-by: Jan-Simon Möller --- build | 2 +- init_buildsystem | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build b/build index 914c120..eddec67 100755 --- a/build +++ b/build @@ -1275,7 +1275,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do XENID="${XENID##*/}" CROSS_INIT_SCRIPT="/.build/build" # to run the qemu initialization in the XEN chroot, we need to register it with a statically build shell - if [ x"$BUILD_ARCH" == xarmv4l -o x"$BUILD_ARCH" == xarmv5el -o x"$BUILD_ARCH" == xarmv7el -o x"$BUILD_ARCH" == xsh4 -o x"$BUILD_ARCH" == xppc ]; then + if [ x"$BUILD_ARCH" == xarmv4l -o x"$BUILD_ARCH" == xarmv5el -o x"$BUILD_ARCH" == xarmv7el -o x"$BUILD_ARCH" == xsh4 -o x"$BUILD_ARCH" == xppc -o x"$BUILD_ARCH" == xppc64 -o x"$BUILD_ARCH" == xmips -o x"$BUILD_ARCH" == xmipsel ]; then if [ -n "$(uname -m | grep '[x3-6]86')" ]; then if [ -e /bin/bash-static -a -e /bin/mount-static ]; then CROSS_INIT_SCRIPT="/.build/initscript_qemu_vm" diff --git a/init_buildsystem b/init_buildsystem index 99afc67..ff1030f 100755 --- a/init_buildsystem +++ b/init_buildsystem @@ -309,7 +309,7 @@ function register_qemu_user { # Detect cross-build (fixed code) and copy qemus for cross-build emulation mode # And copy also a static host binary shell to run the init scripts in the target chroot # -if [ x"$BUILD_ARCH" == xarmv4l -o x"$BUILD_ARCH" == xarmv5el -o x"$BUILD_ARCH" == xarmv7el -o x"$BUILD_ARCH" == xsh4 -o x"$BUILD_ARCH" == xppc ]; then +if [ x"$BUILD_ARCH" == xarmv4l -o x"$BUILD_ARCH" == xarmv5el -o x"$BUILD_ARCH" == xarmv7el -o x"$BUILD_ARCH" == xsh4 -o x"$BUILD_ARCH" == xppc -o x"$BUILD_ARCH" == xppc64 -o x"$BUILD_ARCH" == xmips -o x"$BUILD_ARCH" == xmipsel ]; then if [ -n "$(uname -m | grep '[x3-6]86')" ]; then if [ -e /usr/sbin/qemu-binfmt-conf.sh ]; then (mkdir -p $BUILD_ROOT/usr/bin $BUILD_ROOT/usr/sbin && set -x && cp /usr/bin/qemu-* $BUILD_ROOT/usr/bin && cp /usr/sbin/qemu-binfmt-conf.sh $BUILD_ROOT/usr/sbin) @@ -318,7 +318,7 @@ if [ x"$BUILD_ARCH" == xarmv4l -o x"$BUILD_ARCH" == xarmv5el -o x"$BUILD_ARCH" = if [ -e /bin/bash-static -a -e /bin/mount-static ]; then (mkdir -p $BUILD_ROOT/bin && set -x && cp /bin/bash-static $BUILD_ROOT/bin && cp /bin/mount-static $BUILD_ROOT/bin && chmod a+x $BUILD_ROOT/bin/*-static ) fi - if [ -e /proc/sys/fs/binfmt_misc/arm -o -e /proc/sys/fs/binfmt_misc/armeb -o -e /proc/sys/fs/binfmt_misc/sh4 ]; then + if [ -e /proc/sys/fs/binfmt_misc/arm -o -e /proc/sys/fs/binfmt_misc/armeb -o -e /proc/sys/fs/binfmt_misc/sh4 -o -e /proc/sys/fs/binfmt_misc/mips -o -e /proc/sys/fs/binfmt_misc/ppc -o -e /proc/sys/fs/binfmt_misc/ppc64 ]; then echo "qemu-* already registered" else if [ -e /usr/sbin/qemu-binfmt-conf.sh ]; then -- 2.7.4