Stop using --strip on tar commands

Signed-off-by: Stewart X Addison <[email protected]>

buildenv/jenkins/getDependency

@@ -19,7 +19,7 @@ def testBuild() {
 			if( params.BUILD_TYPE == "systemtest" ){
 				sh 'curl -OLJks "https://api.adoptopenjdk.net/v3/binary/latest/8/ga/linux/x64/jdk/hotspot/normal/adoptopenjdk"'
 				sh 'mkdir ${WORKSPACE}/j2sdk-image'
-				sh 'tar -xzf OpenJDK8U-jdk_x64_linux_hotspot*.gz -C ${WORKSPACE}/j2sdk-image --strip-components 1'
+				sh -c 'mkdir dir.$$ && cd dir.$$ && gzip -cd ../OpenJDK8U-jdk_x64_linux_hotspot*.gz | tar xpf - && mv */* ${WORKSPACE}/j2sdk-image && cd .. && rm -rf dir.$$'
 				sh '${WORKSPACE}/j2sdk-image/jre/bin/java -version'
 				sh 'git clone https://github.com/AdoptOpenJDK/openjdk-systemtest'
 				sh 'git clone https://github.com/AdoptOpenJDK/stf'

get.sh

@@ -323,8 +323,8 @@ getBinaryOpenjdk()
 				if [[ $jar_name == *zip || $jar_name == *jar ]]; then
 					unzip -q $jar_name -d $extract_dir
 				else
-					# some debug-image tar has parent folder. --strip 1 is used to remove it
-					gzip -cd $jar_name | tar xof - -C $extract_dir --strip 1
+					# some debug-image tar has parent folder. This is like gtar --strip 1
+					mkdir dir.$$ && cd dir.$$ && gzip -cd ../$jar_name | tar xof - && mv */* ../$extract_dir && cd .. && rm -rf dir.$$
 				fi
 			else
 				if [ -d "$SDKDIR/openjdkbinary/tmp" ]; then