From b700bbdede249dd290dc67ff2ebdaf730e3ffa6a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 1 Mar 2014 09:32:10 +0100
Subject: 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

---
 scripts/create.sh     |  5 +++--
 scripts/scan-tools.sh | 36 ------------------------------------
 2 files changed, 3 insertions(+), 38 deletions(-)

(limited to 'scripts')

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
-- 
cgit v1.2.3


From 83bcb2289a754df71092de8b31c474e49d4cb227 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 1 Mar 2014 09:46:32 +0100
Subject: remove intltool check, needs to be resolved.

---
 scripts/scan-pkgs.sh | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'scripts')

diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 1ff957c25..13f5deec7 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -77,10 +77,6 @@ if [[ -n $ADK_PACKAGE_SQUID ]]; then
 	NEED_GXX="$NEED_GXX squid"
 fi
 
-if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
-	NEED_INTL="$NEED_INTL xkeyboard-config"
-fi
-
 if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
 	NEED_XMLTO="$NEED_XMLTO libXfont"
 fi
@@ -208,13 +204,6 @@ if [[ -n $NEED_MKFONTDIR ]]; then
 	fi
 fi
 
-if [[ -n $NEED_INTL ]]; then
-	if ! which intltool-update >/dev/null 2>&1; then
-		echo >&2 You need intltool to build $NEED_INTL
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_WWW ]]; then
 	if ! which w3m >/dev/null 2>&1; then
 		if ! which lynx >/dev/null 2>&1; then
-- 
cgit v1.2.3