8 files changed, 77 insertions, 20 deletions
diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph
index 79db626d..25d6712d 100644
--- a/strata/ceph-service.morph
+++ b/strata/ceph-service.morph
@@ -2,20 +2,8 @@ name: ceph-service
 kind: stratum
 build-depends:
 - morph: strata/foundation.morph
+- morph: strata/network-security.morph
 chunks:
-- name: nspr
-  morph: strata/ceph-service/nspr.morph
-  repo: upstream:nspr-hg
-  ref: a6ee84946475c1fb7624973af28163f6da247c0d
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: nss
-  morph: strata/ceph-service/nss.morph
-  repo: upstream:nss
-  ref: ee1c99a3c8c29f50a91ab28f2f7b7773f6355487
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - nspr
 - name: libaio
   morph: strata/ceph-service/libaio.morph
   repo: upstream:libaio
@@ -71,7 +59,6 @@ chunks:
   build-depends:
   - libaio
   - gperftools
-  - nss
   - leveldb
   - libeditline
   - keyutils
diff --git a/strata/ceph-service/nspr.morph b/strata/ceph-service/nspr.morph
deleted file mode 100644
index a5224fb4..00000000
--- a/strata/ceph-service/nspr.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: nspr
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix=$PREFIX --with-mozilla --with-pthreads $([ $(uname -m) = x86_64
-  ] && echo --enable-64bit)
diff --git a/strata/network-security.morph b/strata/network-security.morph
new file mode 100644
index 00000000..3d0c7814
--- /dev/null
+++ b/strata/network-security.morph
@@ -0,0 +1,19 @@
+name: network-security
+kind: stratum
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: nspr
+  morph: strata/network-security/nspr.morph
+  repo: upstream:nspr-hg
+  ref: a6ee84946475c1fb7624973af28163f6da247c0d
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: nss
+  morph: strata/network-security/nss.morph
+  repo: upstream:nss
+  ref: ee1c99a3c8c29f50a91ab28f2f7b7773f6355487
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - nspr
+
diff --git a/strata/network-security/nspr.morph b/strata/network-security/nspr.morph
new file mode 100644
index 00000000..27613eb4
--- /dev/null
+++ b/strata/network-security/nspr.morph
@@ -0,0 +1,12 @@
+name: nspr
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+  case "$MORPH_ARCH" in
+      x86_64|ppc64)
+          EXTRA_ARGS="--enable-64bit";;
+      *)
+          EXTRA_ARGS="";;
+  esac
+  ./configure --prefix="$PREFIX" --with-mozilla --with-pthreads $EXTRA_ARGS
diff --git a/strata/ceph-service/nss.morph b/strata/network-security/nss.morph
index c83fd174..c83fd174 100644
--- a/strata/ceph-service/nss.morph
+++ b/strata/network-security/nss.morph
diff --git a/strata/patch-manager-gerrit.morph b/strata/patch-manager-gerrit.morph
new file mode 100644
index 00000000..bcc03c86
--- /dev/null
+++ b/strata/patch-manager-gerrit.morph
@@ -0,0 +1,11 @@
+name: patch-manager-gerrit
+kind: stratum
+build-depends:
+- morph: strata/tools.morph
+chunks:
+- name: gerrit-installation-binaries
+  morph: strata/patch-manager-gerrit/gerrit-installation-binaries.morph
+  repo: github:franred/gerrit-installation-binaries
+  ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e
+  unpetrify-ref: master
+  build-depends: []
diff --git a/strata/patch-manager-gerrit/gerrit-installation-binaries.morph b/strata/patch-manager-gerrit/gerrit-installation-binaries.morph
new file mode 100644
index 00000000..b0d1a393
--- /dev/null
+++ b/strata/patch-manager-gerrit/gerrit-installation-binaries.morph
@@ -0,0 +1,28 @@
+name: gerrit-installation-binaries
+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
+- mkdir -p "$DESTDIR$PREFIX"/share/gerrit
+- cp gerrit-2.9.war "$DESTDIR$PREFIX"/share/gerrit
+- tar zxf jdk-8u20-linux-x64.tar.gz -C "$DESTDIR$PREFIX"/lib
+- 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/
+system-integration:
+  gerrit-installation-binaries-misc:
+    01-adduser:
+    - adduser -D -h /home/gerrit2 -g 'Gerrit Administrator' -s /bin/sh gerrit2
+    02-install-gerrit:
+    - |
+      install -D /usr/share/gerrit/gerrit-2.9.war /home/gerrit2/gerrit/gerrit-2.9.war \
+              -o gerrit2 -g gerrit2 -m 644
+      chown gerrit2 /home/gerrit2/gerrit
+      sudo LD_LIBRARY_PATH=/usr/jdk1.8.0_20/jre/lib/amd64/jli \
+           -u gerrit2 java -jar /home/gerrit2/gerrit/gerrit-2.9.war \
+           init --batch -d /home/gerrit2/gerrit/.gerrit_controller \
+           --no-auto-start
+      sed -i "s|canonicalWebUrl =.*|canonicalWebUrl = http://localhost:8080|g" \
+              /home/gerrit2/gerrit/.gerrit_controller/etc/gerrit.config
diff --git a/strata/tools.morph b/strata/tools.morph
index 6ee70fdb..e039b50a 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -170,3 +170,9 @@ chunks:
   ref: a4769dc7999b53260325fb89945bef85714fb338
   unpetrify-ref: baserock/morph
   build-depends: []
+- name: procps-ng
+  repo: upstream:procps-ng
+  ref: 85fff468fa263cdd2ff1c0144579527c32333695
+  unpetrify-ref: v3.3.9
+  build-depends: []
+  prefix: /