From f6c42e384caaa6ada40cc042d141e15111ae34ee Mon Sep 17 00:00:00 2001 From: Martin Mohring Date: Mon, 20 Apr 2009 19:53:20 +0000 Subject: [PATCH] - fixed: forgot quoting the regexp --- build | 2 +- init_buildsystem | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build b/build index 5810e70..8c6831d 100755 --- a/build +++ b/build @@ -1029,7 +1029,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do 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 [ -n "$(uname -m | grep [x3-6]86)" ]; 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" fi diff --git a/init_buildsystem b/init_buildsystem index 48ea49c..ef77295 100755 --- a/init_buildsystem +++ b/init_buildsystem @@ -277,7 +277,7 @@ function register_qemu_user { # 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 [ -n "$(uname -m | grep [x3-6]86)" ]; 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) fi @@ -305,7 +305,7 @@ fi # Ubuntu 8.04, 8.10, 9.04 at least seem to do that function reset_mmap_min_addr { 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 [ -n "$(uname -m | grep [x3-6]86)" ]; then + if [ -n "$(uname -m | grep '[x3-6]86')" ]; 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 ]; then # echo "reset mmap_min_addr to 0" test -e /proc/sys/vm/mmap_min_addr && echo 0 > /proc/sys/vm/mmap_min_addr -- 2.7.4