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 /strata | |
parent | bfc5c311c068759808ee2f188ec0ca90a349d753 (diff) | |
download | definitions-a484f6065b972ab8de0c143fe16f994a1dac3d4b.tar.gz |
Alter ZooKeeper to use new java structure
Change-Id: I3362201333cf51c11311cca4d65b675832d83738
Diffstat (limited to 'strata')
-rw-r--r-- | strata/zookeeper.morph | 14 | ||||
-rw-r--r-- | strata/zookeeper/java-binary.morph | 11 |
2 files changed, 1 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/ |