Merge branch 'master' of git+ssh://openadk.org/git/openadk

7 files changed, 21 insertions, 69 deletions

diff --git a/scripts/automake.dep b/scripts/automake.dep
deleted file mode 100644
index 2cfd5d3ce..000000000
--- a/scripts/automake.dep
+++ /dev/null
@@ -1,36 +0,0 @@
-configure configure.ac
-configure configure.in
-configure configure.sh
-configure missing
-/Makefile.in /Makefile.am
-/Makefile.in configure.in
-/Makefile.in configure.ac
-/Makefile.in aclocal.m4
-aclocal.m4 configure.in
-aclocal.m4 configure.ac
-aclocal.m4 acinclude.m4
-config-h.in configure.in
-config-h.in configure.ac
-config.h.in configure.in
-config.h.in configure.ac
-config.h.in aclocal.m4
-config.h.in autoconfig.h.in
-config.h.in gpsd_config.h.in
-configure configure.in
-configure configure.ac
-configure aclocal.m4
-stamp-h.in configure.in
-stamp-h.in configure.ac
-stamp-h.in aclocal.m4
-stamp-h.in acconfig.h
-/Makefile.am subdirs
-/Makefile.am /Makefile.am.in
-subdirs /Makefile.am.in
-configure.files subdirs
-configure.files /configure.in.in
-configure.files admin/configure.in.min
-configure.in configure.files
-acinclude.m4 admin/libtool.m4.in
-acinclude.m4 admin/acinclude.m4.in
-acinclude.m4 libltdl/ltdl.m4
-libtoolize.in configure
diff --git a/scripts/create.sh b/scripts/create.sh
index f5309f884..505549247 100755
--- a/scripts/create.sh
+++ b/scripts/create.sh
@@ -2,7 +2,7 @@
 #-
 # Copyright © 2010, 2011, 2012
 #	Thorsten Glaser <tg@mirbsd.org>
-# Copyright © 2010, 2011
+# Copyright © 2010-2014
 #	Waldemar Brodkorb <wbx@openadk.org>
 #
 # Provided that these terms and disclaimer and all copyright notices
@@ -36,19 +36,6 @@ case :$PATH: in
 (*) export PATH=$PATH:$TOPDIR/host_$HOST/usr/bin ;;
 esac
 
-test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then
-	make package=mksh fetch || exit 1
-	df=mksh-R48b.tgz
-	rm -rf build_mksh
-	mkdir -p build_mksh
-	gzip -dc dl/"$df" | (cd build_mksh; cpio -mid)
-	cd build_mksh/mksh
-	bash Build.sh -r -c lto || bash Build.sh -r || exit 1
-	cp mksh "$TOPDIR"/bin
-	cd "$TOPDIR"
-	rm -rf build_mksh
-fi
-
 test -n "$KSH_VERSION" || exec mksh "$me" "$@"
 if test -z "$KSH_VERSION"; then
 	echo >&2 Fatal error: could not run myself with mksh!
diff --git a/scripts/find b/scripts/find
new file mode 100755
index 000000000..ea38d92fb
--- /dev/null
+++ b/scripts/find
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+if [ -z "$(which gfind 2>/dev/null)" ];then
+	/usr/bin/find "$@"
+else
+	gfind "$@"
+fi
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 5563dcca2..8af04795b 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -83,11 +83,4 @@ if [[ -n $NEED_JAVA ]]; then
 	fi
 fi
 
-if [[ -n $ADK_USE_CCACHE ]]; then
-        if ! which ccache >/dev/null 2>&1; then
-                echo >&2 You have selected to build with ccache, but ccache could not be found.
-                out=1
-        fi
-fi
-
 exit $out
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index a7883cb24..c16aff609 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -37,8 +37,9 @@ if [[ -e foo ]]; then
 		Darwin*)
 			echo "Building OpenADK on $os needs a case-sensitive disk partition."
 			echo "For Snow Leopard and above you can use diskutil to resize your existing disk."
-			echo "For older versions you might consider to use a disk image."
 			echo "Example: sudo diskutil resizeVolume disk0s2 90G 1 jhfsx adk 30G"
+			echo "For older versions you might consider to use a disk image:"
+			echo "hdiutil create -type SPARSE -fs 'Case-sensitive Journaled HFS+' -size 30g ~/openadk.dmg"
 			;;
 	esac
 	exit 1
diff --git a/scripts/update-sys b/scripts/update-sys
index 6c82dc626..47b73d52b 100755
--- a/scripts/update-sys
+++ b/scripts/update-sys
@@ -14,15 +14,6 @@ defaults() {
 	exit 0
 }
 
-check_native() {
-	native=$(grep ^ADK_LINUX_NATIVE $topdir/.config)
-	if [ ! -z "$native" ];then
-		exit 0
-	fi
-}
-
-touch $topdir/target/config/Config.in.native
-
 for i in $(ls $topdir/target/);do
 	if [ -d "$topdir/target/$i/sys-enabled" ];then
 		cat $topdir/target/$i/sys-enabled/* > $topdir/target/$i/Config.in.systems 2>/dev/null
@@ -30,8 +21,6 @@ for i in $(ls $topdir/target/);do
 done
 if [ -f $topdir/.config ];then
 
-check_native
-
 arch=$(grep ^ADK_TARGET_ARCH $topdir/.config|cut -f 2 -d = | sed -e 's#"##g')
 cpuarch=$(grep ^ADK_TARGET_CPU_ARCH $topdir/.config|cut -f 2 -d = | sed -e 's#"##g')
 systemsym=$(grep ^ADK_TARGET_SYSTEM_ $topdir/.config|cut -f 1 -d =) 
diff --git a/scripts/xargs b/scripts/xargs
new file mode 100755
index 000000000..cbe9bd015
--- /dev/null
+++ b/scripts/xargs
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+if [ -z "$(which gxargs 2>/dev/null)" ];then
+	/usr/bin/xargs "$@"
+else
+	gxargs "$@"
+fi