diff options
author | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2015-06-11 14:42:00 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-06-12 10:40:47 +0000 |
commit | a484f6065b972ab8de0c143fe16f994a1dac3d4b (patch) | |
tree | 695dcaacdfbc8a259fbf52b894f7901ae5ba9698 | |
parent | bfc5c311c068759808ee2f188ec0ca90a349d753 (diff) | |
download | definitions-a484f6065b972ab8de0c143fe16f994a1dac3d4b.tar.gz |
Alter ZooKeeper to use new java structure
Change-Id: I3362201333cf51c11311cca4d65b675832d83738
-rw-r--r-- | strata/zookeeper.morph | 14 | ||||
-rw-r--r-- | strata/zookeeper/java-binary.morph | 11 | ||||
-rw-r--r-- | systems/zookeeper-client-x86_64.morph | 2 | ||||
-rw-r--r-- | systems/zookeeper-server-x86_64.morph | 2 |
4 files changed, 5 insertions, 24 deletions
diff --git a/strata/zookeeper.morph b/strata/zookeeper.morph index 2baf6f58..e345b6d1 100644 --- a/strata/zookeeper.morph +++ b/strata/zookeeper.morph @@ -5,22 +5,10 @@ description: | build-depends: - morph: strata/core.morph - morph: strata/test-tools.morph +- morph: strata/java.morph chunks: -- name: java-binary - morph: strata/zookeeper/java-binary.morph - repo: github:franred/gerrit-installation-binaries - ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e - unpetrify-ref: master -- name: java-ant - morph: strata/zookeeper/java-ant.morph - repo: upstream:java/ant - ref: master - build-depends: - - java-binary - name: zookeeper morph: strata/zookeeper/zookeeper.morph repo: upstream:zookeeper ref: baserock/mikesmith/zookeeper unpetrify-ref: trunk - build-depends: - - java-ant diff --git a/strata/zookeeper/java-binary.morph b/strata/zookeeper/java-binary.morph deleted file mode 100644 index ba0c28a4..00000000 --- a/strata/zookeeper/java-binary.morph +++ /dev/null @@ -1,11 +0,0 @@ -name: java-binary -kind: chunk -configure-commands: [] -build-commands: -- cat jdk-8u20-linux-x64.tar.gz_* > jdk-8u20-linux-x64.tar.gz -install-commands: -- mkdir -p "$DESTDIR$PREFIX"/bin -- mkdir -p "$DESTDIR$PREFIX"/lib -- tar zxf jdk-8u20-linux-x64.tar.gz -C "$DESTDIR$PREFIX"/lib --no-same-owner -- unzip jce_policy-8.zip -d "$DESTDIR$PREFIX"/lib/jdk1.8.0_20/jre/lib/security -- ln -sfn "$PREFIX"/lib/jdk1.8.0_20/jre/bin/java "$DESTDIR$PREFIX"/bin/ diff --git a/systems/zookeeper-client-x86_64.morph b/systems/zookeeper-client-x86_64.morph index bc470df5..9b720f50 100644 --- a/systems/zookeeper-client-x86_64.morph +++ b/systems/zookeeper-client-x86_64.morph @@ -19,6 +19,8 @@ strata: morph: strata/zookeeper-client.morph - name: test-tools morph: strata/test-tools.morph +- name: java + morph: strata/java.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/zookeeper-server-x86_64.morph b/systems/zookeeper-server-x86_64.morph index bc46d7b3..37a60ae2 100644 --- a/systems/zookeeper-server-x86_64.morph +++ b/systems/zookeeper-server-x86_64.morph @@ -19,6 +19,8 @@ strata: morph: strata/zookeeper-server.morph - name: test-tools morph: strata/test-tools.morph +- name: java + morph: strata/java.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files |