diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-29 02:57:59 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-29 02:57:59 +0200 |
| commit | 61104736912c7811abf505418c8202262e3cd0ac (patch) | |
| tree | b6a0709d2c36a8423e61895a84755d5d1fdf4d21 /scripts | |
| parent | 262c556759cc36fecca894721c91b06a6ce3b8f0 (diff) | |
| parent | b2e4d29ea9c3c2f5b99264bd270d4257439dfc3f (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/scan-tools.sh | 10 | ||||
| -rwxr-xr-x | scripts/update-sys | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 8834940c7..4ffe44649 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -112,8 +112,14 @@ if ! which gzip >/dev/null 2>&1; then out=1 fi -if ! which lzma >/dev/null 2>&1 && ! which xz >/dev/null 2>&1; then - echo You must install lzma or xz-utils to continue. +if ! which lzma >/dev/null 2>&1; then + echo You must install lzma to continue. + echo + out=1 +fi + +if ! which xz >/dev/null 2>&1; then + echo You must install xz-utils to continue. echo out=1 fi diff --git a/scripts/update-sys b/scripts/update-sys index bcfbfa84e..268184428 100755 --- a/scripts/update-sys +++ b/scripts/update-sys @@ -50,7 +50,7 @@ config $archsym EOF if [ "${system}" = "toolchain" -o "${system}" = "qemu" ];then - sys=${system}-$cpuarch + sys=${system}-$arch else sys=$system fi |