summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-01 09:32:10 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-01 09:32:10 +0100
commitb700bbdede249dd290dc67ff2ebdaf730e3ffa6a (patch)
tree53c9e6bbdee8b73c4061d0132776791a8ab46787 /scripts
parent9e358d94cc283c8022091e67fe3ca0580301a62a (diff)
move target/tools to tools, use ADK_HOST_NEED variable to build a tool, when required. Add archivers to tools, remove prereq checks for them. Rename host_ dir in preparation for shared openadk source via nfs/smb from different host systems. Make some abi cleanup
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/create.sh5
-rw-r--r--scripts/scan-tools.sh36
2 files changed, 3 insertions, 38 deletions
diff --git a/scripts/create.sh b/scripts/create.sh
index 634a87643..f5309f884 100755
--- a/scripts/create.sh
+++ b/scripts/create.sh
@@ -28,11 +28,12 @@
# root partition and an OpenADK cfgfs partition.
TOPDIR=$(pwd)
+HOST=$(gcc -dumpmachine)
me=$0
case :$PATH: in
-(*:$TOPDIR/bin:*) ;;
-(*) export PATH=$PATH:$TOPDIR/bin ;;
+(*:$TOPDIR/host_$HOST/usr/bin:*) ;;
+(*) export PATH=$PATH:$TOPDIR/host_$HOST/usr/bin ;;
esac
test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index a060d24fc..af3223b0b 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -112,30 +112,6 @@ if ! which gzip >/dev/null 2>&1; then
out=1
fi
-if ! which bzip2 >/dev/null 2>&1; then
- echo You must install bzip2 to continue.
- echo
- out=1
-fi
-
-if ! which lzop >/dev/null 2>&1; then
- echo You must install lzop to continue.
- echo
- out=1
-fi
-
-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
-
if ! which patch >/dev/null 2>&1; then
echo You must install patch to continue.
echo
@@ -219,18 +195,6 @@ if ! which perl >/dev/null 2>&1; then
out=1
fi
-if ! which m4 >/dev/null 2>&1; then
- echo "You must install m4 (macro processor) to continue."
- echo
- out=1
-fi
-
-if ! which bc >/dev/null 2>&1; then
- echo "You need bc to continue."
- echo
- out=1
-fi
-
if ! which xargs >/dev/null 2>&1; then
echo "You need xargs to continue."
echo