summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-09-03 15:14:38 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-09-03 15:14:38 +0000
commitaaa598f754cfaa35ef27913eb8fb53f6ae4e19f2 (patch)
tree5d83ece667e60d79b6769cf4ad6051db39c4d656
parent5de9d604c21b26672cd0957763ce6365860da95e (diff)
downloaddefinitions-aaa598f754cfaa35ef27913eb8fb53f6ae4e19f2.tar.gz
FIXUPME: remove bad dependencies debian/sun
-rw-r--r--strata/openstack-app/gerrit-installation-binaries.morph14
1 files changed, 6 insertions, 8 deletions
diff --git a/strata/openstack-app/gerrit-installation-binaries.morph b/strata/openstack-app/gerrit-installation-binaries.morph
index a3eb15f2..74730efe 100644
--- a/strata/openstack-app/gerrit-installation-binaries.morph
+++ b/strata/openstack-app/gerrit-installation-binaries.morph
@@ -1,12 +1,11 @@
name: gerrit-installation-binaries
kind: chunk
configure-commands:
-- ar vx openjdk-7-jre-headless_7u65-2.5.1-5_amd64.deb
-- tar Jxf data.tar.xz -C "$DESTDIR"/
- mkdir -p "$DESTDIR"/usr/local/share/gerrit
- mkdir -p "$DESTDIR"/usr/bin
-- unzip UnlimitedJCEPolicyJDK7.zip -d "$DESTDIR"/usr/local/share
-- tar zxf jdk-8u20-solaris-x64.tar.gz -C "$DESTDIR"/usr/local/share
+- cat jdk-8u20-linux-x64.tar.gz_* > jdk-8u20-linux-x64.tar.gz
+- tar zxf jdk-8u20-linux-x64.tar.gz -C "$DESTDIR"/usr/local/share
+- unzip jce_policy-8.zip -d "$DESTDIR"/usr/local/share
build-commands: []
install-commands:
- cp gerrit-2.9.war "$DESTDIR"/usr/local/share/gerrit
@@ -14,7 +13,6 @@ install-commands:
- touch "$DESTDIR"/etc/.java/.systemPrefs/.system.lock
- touch "$DESTDIR"/etc/.java/.systemPrefs/.systemRootModFile
- chmod 644 "$DESTDIR"/etc/.java/.systemPrefs/.systemRootModFile
-- ln -sfn /usr/lib/jvm/java-7-openjdk-amd64/bin/java "$DESTDIR"/usr/bin/
-- cp -f "$DESTDIR"/usr/local/share/UnlimitedJCEPolicy/US_export_policy.jar "$DESTDIR"/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/security/
-- cp -f "$DESTDIR"/usr/local/share/UnlimitedJCEPolicy/local_policy.jar "$DESTDIR"/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/security/
-- ln -sfn /usr/local/share/jdk1.8.0_20/jre/lib/security/cacerts "$DESTDIR"/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/security
+- ln -sfn /usr/local/share/jdk1.8.0_20/jre/bin/java "$DESTDIR"/usr/bin/
+- cp -f "$DESTDIR"/usr/local/share/UnlimitedJCEPolicyJDK8/US_export_policy.jar "$DESTDIR"/usr/local/share/jdk1.8.0_20/jre/lib/security/
+- cp -f "$DESTDIR"/usr/local/share/UnlimitedJCEPolicyJDK8/local_policy.jar "$DESTDIR"/usr/local/share/jdk1.8.0_20/jre/lib/security/