From 6692b15f8bd7ffc742cce5b67b963b458f87f8b6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Mar 2011 03:14:11 +0200
Subject: avoid warnings on fresh checkout

---
 scripts/reloc.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/reloc.sh b/scripts/reloc.sh
index f7a0a1e3b..59323612f 100755
--- a/scripts/reloc.sh
+++ b/scripts/reloc.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 # execute this after relocation of adk directory
 
-olddir=$(grep "^TOPDIR" prereq.mk |cut -d '=' -f 2)
+olddir=$(grep "^TOPDIR" prereq.mk 2>/dev/null |cut -d '=' -f 2)
 newdir=$(pwd)
 
-if [ "$olddir" != "$newdir" ];then
+if [ ! -z $olddir ];then
+  if [ "$olddir" != "$newdir" ];then
 	echo "adk directory relocated!"
 	echo "old directory: $olddir"
 	echo "new directory: $newdir"
@@ -13,4 +14,5 @@ if [ "$olddir" != "$newdir" ];then
 	sed -i -e "s#$olddir#$newdir#g" $(find target_*/scripts -type f|xargs)
 	sed -i -e "s#$olddir#$newdir#" target_*/etc/ipkg.conf
 	sed -i -e "s#$olddir#$newdir#" prereq.mk
+  fi
 fi
-- 
cgit v1.2.3


From 0c9fca670b86871f111e1cda82ac8f70605992be Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Mar 2011 03:06:55 +0200
Subject: add first step to get java working

---
 scripts/sha256sum | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100755 scripts/sha256sum

(limited to 'scripts')

diff --git a/scripts/sha256sum b/scripts/sha256sum
new file mode 100755
index 000000000..3c0a706c7
--- /dev/null
+++ b/scripts/sha256sum
@@ -0,0 +1,7 @@
+#!/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.
+
+tmp=$(mktemp -t yyy)
+cat - > $tmp
+shasum -a 256 "$@" $tmp
-- 
cgit v1.2.3


From 0089f52549024a74c66dccd592e6774c18210ea6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Mar 2011 14:53:42 +0200
Subject: modify to work under Linux

---
 scripts/sha256sum | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/sha256sum b/scripts/sha256sum
index 3c0a706c7..da34d9113 100755
--- a/scripts/sha256sum
+++ b/scripts/sha256sum
@@ -2,6 +2,10 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-tmp=$(mktemp -t yyy)
-cat - > $tmp
-shasum -a 256 "$@" $tmp
+if [ -x /usr/bin/sha256sum ]; then
+	/usr/bin/sha256sum "$@"
+else
+	tmp=$(mktemp -t yyy)
+	cat - > $tmp
+	shasum -a 256 "$@" $tmp
+fi
-- 
cgit v1.2.3


From dd57c7c17b452f555fec0767f3a13e717c2a8cc1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Mar 2011 18:05:16 +0200
Subject: allow lzma or newer xz-utils to be used

---
 scripts/scan-tools.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 7d6d73e53..8834940c7 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -112,8 +112,8 @@ if ! which gzip >/dev/null 2>&1; then
 	out=1
 fi
 
-if ! which lzma >/dev/null 2>&1; then
-	echo You must install lzma to continue.
+if ! which lzma >/dev/null 2>&1 && ! which xz >/dev/null 2>&1; then
+	echo You must install lzma or xz-utils to continue.
 	echo
 	out=1
 fi
-- 
cgit v1.2.3