diff options
Diffstat (limited to 'source/ap/ash')
| -rwxr-xr-x | source/ap/ash/ash.SlackBuild | 18 | ||||
| -rw-r--r-- | source/ap/ash/patches/ash-hetio.patch | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/source/ap/ash/ash.SlackBuild b/source/ap/ash/ash.SlackBuild index deaad12d..f83113c2 100755 --- a/source/ap/ash/ash.SlackBuild +++ b/source/ap/ash/ash.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,17 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=0.4.0 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} @@ -32,7 +41,8 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -tar xzvf $CWD/ash-$VERSION.tar.gz +rm -rf ash-$VERSION +tar xzvf $CWD/ash-$VERSION.tar.gz || exit 1 cd ash-$VERSION chown -R root:root . ( cd $CWD/patches diff --git a/source/ap/ash/patches/ash-hetio.patch b/source/ap/ash/patches/ash-hetio.patch index c416cde5..a6800897 100644 --- a/source/ap/ash/patches/ash-hetio.patch +++ b/source/ap/ash/patches/ash-hetio.patch @@ -177,7 +177,7 @@ diff -urN ash-0.4.0/hetio.c ash-0.4.0-/hetio.c + out1str("\b \b"); + --*cursor; + memmove(parsenextc + *cursor, parsenextc + *cursor + 1, -+ BUFSIZ - *cursor + 1); ++ BUFSIZ - (*cursor + 1)); + + for (j = *cursor; j < (BUFSIZ - 1); j++) { + if (!*(parsenextc + j)) |