9 files changed, 21 insertions, 81 deletions
diff --git a/strata/ansible.morph b/strata/ansible.morph
index 33a23750..4af0e805 100644
--- a/strata/ansible.morph
+++ b/strata/ansible.morph
@@ -8,5 +8,5 @@ chunks:
 - name: ansible
   morph: strata/ansible/ansible.morph
   repo: upstream:ansible
-  ref: ebc8d48d34296fe010096f044e2b7591df37a622
+  ref: 0a7124541247cc613352054f4bc0c3e116e0b657
   unpetrify-ref: baserock/v1.8.4
diff --git a/strata/core.morph b/strata/core.morph
index 263eac60..84dcb722 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -12,8 +12,8 @@ chunks:
 - name: cmake
   morph: strata/core/cmake.morph
   repo: upstream:cmake
-  ref: 0b3781e4c497566acaa504d4106d11c02a642501
-  unpetrify-ref: v2.8.12.2
+  ref: 732d8a467ab8a295b1bbf580f865980f8a1a9b29
+  unpetrify-ref: v3.2.1
 - name: gdbm
   morph: strata/core/gdbm.morph
   repo: upstream:gdbm-tarball
diff --git a/strata/gitlab.morph b/strata/gitlab.morph
deleted file mode 100644
index ab77e7bb..00000000
--- a/strata/gitlab.morph
+++ /dev/null
@@ -1,21 +0,0 @@
-name: gitlab
-kind: stratum
-description: gitlab components for server, ci etc
-build-depends:
-- morph: strata/ruby.morph
-chunks:
-- name: gitlab-ce
-  morph: strata/gitlab/gitlab-ce.morph
-  repo: upstream:gitlab/gitlab-ce
-  ref: 53d98a77d34cbfddaef9eb25cf5f651a78550425
-  unpetrify-ref: baserock/v7.0.0
-- name: gitlab-ci
-  morph: strata/gitlab/gitlab-ci.morph
-  repo: upstream:gitlab/gitlab-ci
-  ref: c74044d65dec2ba8311e242c84e07a67abd52d37
-  unpetrify-ref: baserock/morph
-- name: gitlab-shell
-  morph: strata/gitlab/gitlab-shell.morph
-  repo: upstream:gitlab/gitlab-shell
-  ref: 0b4106d57223c666d9360339fd3790174aa43800
-  unpetrify-ref: baserock/morph
diff --git a/strata/gitlab/gitlab-ce.morph b/strata/gitlab/gitlab-ce.morph
deleted file mode 100644
index 571881f8..00000000
--- a/strata/gitlab/gitlab-ce.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: gitlab-ce
-kind: chunk
-install-commands:
-- mkdir -p "$DESTDIR/$PREFIX/share/gitlab-ce"
-- cp -R * "$DESTDIR/$PREFIX/share/gitlab-ce"
-- chmod -R a+rX,g+w "$DESTDIR/$PREFIX/share/gitlab-ce"
diff --git a/strata/gitlab/gitlab-ci.morph b/strata/gitlab/gitlab-ci.morph
deleted file mode 100644
index 99d01367..00000000
--- a/strata/gitlab/gitlab-ci.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: gitlab-ci
-kind: chunk
-install-commands:
-- mkdir -p "$DESTDIR/$PREFIX/share/gitlab-ci"
-- cp -R * "$DESTDIR/$PREFIX/share/gitlab-ci"
-- chmod -R a+rX,g+w "$DESTDIR/$PREFIX/share/gitlab-ci"
diff --git a/strata/gitlab/gitlab-shell.morph b/strata/gitlab/gitlab-shell.morph
deleted file mode 100644
index 069c6c41..00000000
--- a/strata/gitlab/gitlab-shell.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: gitlab-shell
-kind: chunk
-install-commands:
-- mkdir -p "$DESTDIR/$PREFIX/share/gitlab-shell"
-- cp -R * "$DESTDIR/$PREFIX/share/gitlab-shell"
-- chmod -R a+rX,g+w "$DESTDIR/$PREFIX/share/gitlab-shell"
diff --git a/strata/patch-manager-gerrit.morph b/strata/patch-manager-gerrit.morph
deleted file mode 100644
index 60e6d6cd..00000000
--- a/strata/patch-manager-gerrit.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-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
diff --git a/strata/patch-manager-gerrit/gerrit-installation-binaries.morph b/strata/patch-manager-gerrit/gerrit-installation-binaries.morph
deleted file mode 100644
index b0d1a393..00000000
--- a/strata/patch-manager-gerrit/gerrit-installation-binaries.morph
+++ /dev/null
@@ -1,28 +0,0 @@
-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/python-tools.morph b/strata/python-tools.morph
index 0acc1c0c..0bba0502 100644
--- a/strata/python-tools.morph
+++ b/strata/python-tools.morph
@@ -3,9 +3,26 @@ kind: stratum
 description: "A stratum for non-essential python tools:
 useful python tools that we don't want to include in core."
 build-depends:
-- morph: strata/core.morph
+- morph: strata/python-core.morph
 chunks:
 - name: virtualenv
   repo: upstream:python-packages/virtualenv
   ref: 9205ff46a67130e8835f14bb4f802fd59e7dcf2c
   unpetrify-ref: 12.0.5
+
+## Pylint
+- name: astroid
+  repo: upstream:python-packages/astroid
+  ref: 194dc114a33b80b4bfbbeb73f36712848f696025
+  unpetrify-ref: astroid-1.3.5
+  build-depends: []
+- name: logilab-common
+  repo: upstream:python-packages/logilab-common
+  ref: d1d8f793af6d015d885b9ea67b5741d5a093e2f4
+  unpetrify-ref: logilab-common-version-0.62.0
+  build-depends: []
+- name: pylint
+  repo: upstream:python-packages/pylint
+  ref: ba998d7a4e5fce0ea3a3e701ff446bbe4ca406b5
+  unpetrify-ref: pylint-1.4.2
+  build-depends: []