From c2b7eef262a95b296388a4b6791c09c1c7d96817 Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Tue, 22 Sep 2015 11:56:01 -0700 Subject: [PATCH] Backed out changeset 520103c26e0c (bug 1206106) for apparently breaking b2g device builds CLOSED TREE --- .../scripts/misc/repackage-jdk-centos.sh | 33 ------------------- ...package-jdk-ubuntu.sh => repackage-jdk.sh} | 0 2 files changed, 33 deletions(-) delete mode 100755 testing/taskcluster/scripts/misc/repackage-jdk-centos.sh rename testing/taskcluster/scripts/misc/{repackage-jdk-ubuntu.sh => repackage-jdk.sh} (100%) diff --git a/testing/taskcluster/scripts/misc/repackage-jdk-centos.sh b/testing/taskcluster/scripts/misc/repackage-jdk-centos.sh deleted file mode 100755 index 5783baf6922..00000000000 --- a/testing/taskcluster/scripts/misc/repackage-jdk-centos.sh +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/bash - -set -e -x - -mkdir artifacts -cd build - -rm -rf root && mkdir root && cd root - -# change these variables when updating java version -mirror_url_base="http://mirror.centos.org/centos/6.7/updates/x86_64/Packages" -openjdk=java-1.7.0-openjdk-1.7.0.85-2.6.1.3.el6_7.x86_64.rpm -openjdk_devel=java-1.7.0-openjdk-1.7.0.85-2.6.1.3.el6_7.x86_64.rpm -jvm_openjdk_dir=java-1.7.0-openjdk-1.7.0.85.x86_64 - -# grab the rpm and unpack it -wget ${mirror_url_base}/${openjdk} -wget ${mirror_url_base}/${openjdk_devel} -rpm2cpio $openjdk | cpio -ivd -rpm2cpio $openjdk_devel | cpio -ivd - -cd usr/lib/jvm -mv $jvm_openjdk_dir java_home - -# document version this is based on -echo "Built from ${mirror_url_Base} - ${openjdk} - ${openjdk_devel} - -Run through rpm2cpio | cpio, and /usr/lib/jvm/${jvm_openjdk_dir} renamed to 'java_home'." > java_home/VERSION - -# tarball the unpacked rpm and put it in the taskcluster upload artifacts dir -tar -Jvcf ~/artifacts/java_home-${jvm_openjdk_dir}.tar.xz java_home diff --git a/testing/taskcluster/scripts/misc/repackage-jdk-ubuntu.sh b/testing/taskcluster/scripts/misc/repackage-jdk.sh similarity index 100% rename from testing/taskcluster/scripts/misc/repackage-jdk-ubuntu.sh rename to testing/taskcluster/scripts/misc/repackage-jdk.sh