Upgrade to support CPU2006V1.2 and drop support for CPU2006V1.1.

Also rebuild SPEC tools for armv7l to use standard naming scheme.
Add APM's SPEC tools for AArch64.

6 files changed, 59 insertions, 25 deletions

diff --git a/armv7l-linux-111.tar b/armv7l-linux-111.tar
deleted file mode 100644
index 8e5f8d8..0000000
--- a/armv7l-linux-111.tar
+++ /dev/null
diff --git a/armv7l-linux-122.tar.bz2 b/armv7l-linux-122.tar.bz2
deleted file mode 100644
index 4ef7245..0000000
--- a/armv7l-linux-122.tar.bz2
+++ /dev/null
diff --git a/linux-apm-arm64-118.tar b/linux-apm-arm64-118.tar
new file mode 100644
index 0000000..ee0b2a4
--- /dev/null
+++ b/linux-apm-arm64-118.tar
diff --git a/linux-armv7l-118.tar b/linux-armv7l-118.tar
new file mode 100644
index 0000000..0a3d29a
--- /dev/null
+++ b/linux-armv7l-118.tar
diff --git a/linux-armv7l-122.tar.bz2 b/linux-armv7l-122.tar.bz2
new file mode 100644
index 0000000..c7a4e13
--- /dev/null
+++ b/linux-armv7l-122.tar.bz2
diff --git a/spec2xxx-install b/spec2xxx-install
index aca542a..f83c45f 100755
--- a/spec2xxx-install
+++ b/spec2xxx-install
@@ -11,8 +11,8 @@ spec=$SPEC
 tar=$1
 
 case "$tar" in
-    *"cpu2000"*|*"CPU2000"*) specver="cpu2000" ;;
-    *"cpu2006"*|*"CPU2006"*) specver="cpu2006" ;;
+    *"CPU2000v1.3"*) specver="cpu2000v1.3" ;;
+    *"cpu2006-1.2"*) specver="cpu2006v1.2" ;;
     *)
 	echo UNKNOWN SPEC VERSION TAR: $tar
 	exit 1
@@ -41,52 +41,86 @@ fi
 
 cat $tar | ssh $target "cd $spec && tar --strip-components=1 -xJ && chmod -R +w ./"
 
-install_env=""
-case "$(ssh $target uname -p)" in
-    "x86_64")
-	case "$specver" in
-	    "cpu2000") arch=linux-glibc22-x86_64 ;;
-	    "cpu2006") arch=linux-suse101-AMD64 ;;
+cpu="$(ssh $target uname -p)"
+toolstar=""
+case "$specver" in
+    "cpu2000v1.3")
+	case "$cpu" in
+	    "x86_64") arch=linux-glibc22-x86_64 ;;
+	    "ia32") arch=linux-redhat62-ia32 ;;
+	    "armv7l")
+		arch=linux-armv7l
+		toolstar=linux-armv7l-122.tar.bz2
+		;;
+	    *)
+		arch="linux-$cpu"
+		toolstar="build"
 	esac
 	;;
-    "ia32") arch=linux-redhat62-ia32 ;;
-    "armv7l")
-	case "$specver" in
-	    "cpu2000") cat $(dirname $0)/armv7l-linux-122.tar.bz2 | ssh $target "cd $spec && tar -xj && chmod -R +w ./" ;;
-	    "cpu2006") cat $(dirname $0)/armv7l-linux-111.tar | ssh $target "cd $spec && tar -x && chmod -R +w ./" ;;
+    "cpu2006v1.2")
+	case "$cpu" in
+	    "x86_64") arch=linux-suse10-amd64 ;;
+	    "ia32") arch=linux-redhat62-ia32 ;;
+	    "armv7ll")
+		arch=linux-armv7l
+		toolstar=linux-armv7l-118.tar
+		;;
+	    "aarch64")
+		arch=linux-apm-arm64
+		toolstar=linux-apm-arm64-118.tar
+		;;
+	    *)
+		arch="linux-$cpu"
+		toolstar="build"
 	esac
-
-	arch=armv7l-linux
 	;;
-    *)
-	# Build tools
-	arch="$(ssh $target uname -p)-linux"
+esac
 
+case "$toolstar" in
+    "") ;;
+    "build")
 	# Make sure bash is used for building perl
 	echo "/bin/bash \$@" > $spec/bin/sh
 	chmod +x $spec/bin/sh
 
 	# Patch up perl sources
 	case "$specver" in
-	    "cpu2000") perl=$spec/tools/src/perl-5.8.7 ;;
-	    "cpu2006") perl=$spec/tools/src/perl-5.8.8 ;;
+	    "cpu2000v1.3")
+		sed -i -e "s#command line#command\.line#" \
+		    $spec/tools/src/perl-5.8.7/makedepend.SH
+		sed -i -e "/asm\/page.h/d" \
+		    $spec/tools/src/perl-5.8.7/ext/IPC/SysV/SysV.xs
+		;;
 	esac
-	sed -i -e "s#command line#command\.line#" $perl/makedepend.SH
-	sed -i -e "/asm\/page.h/d" $perl/ext/IPC/SysV/SysV.xs
 
+	# Find where libm.so and libdl.so are
 	libpth=$(ssh $target find /usr -name libm.so | sed -e "s#/libm.so##")
 
-	ssh $target "cd $spec && PATH=$spec/bin:\$PATH PERLFLAGS='-A libs=-lm -A libs=-ldl -Dlibpth=$libpth' $spec/tools/src/buildtools && . shrc && packagetools $arch"
+	ssh $target "cd $spec && PATH=$spec/bin:\$PATH PERLFLAGS='-A libs=-lm -A libs=-ldl -A libs=-lcrypt -Dlibpth=$libpth' $spec/tools/src/buildtools && . shrc && packagetools $arch"
 
+	# Clean up
 	rm $spec/bin/sh
 
+	# Copy newly-built tools to the scripts dir
 	cp $spec/$arch-*.tar* $(dirname $0)/
 	;;
+    *)
+	case "$specver" in
+	    "cpu2000"*)
+		cat $(dirname $0)/$toolstar \
+		    | ssh $target "cd $spec && tar -xj && chmod -R +w ./"
+		;;
+	    "cpu2006"*)
+		cat $(dirname $0)/$toolstar \
+		    | ssh $target "cd $spec && tar -x && chmod -R +w ./"
+		;;
+	esac
+	;;
 esac
 
 case "$specver" in
-    "cpu2000") ssh $target "cd $spec && ./install.sh $arch" ;;
-    "cpu2006") ssh $target "cd $spec && ./install.sh -f -u $arch" ;;
+    "cpu2000"*) ssh $target "cd $spec && ./install.sh $arch" ;;
+    "cpu2006"*) ssh $target "cd $spec && ./install.sh -f -u $arch" ;;
 esac
 
 $local || fusermount -uz $spec