From 93a67f51872288da56363bbe3eec0e530c6d6c1b Mon Sep 17 00:00:00 2001
From: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Date: Tue, 9 Jun 2015 16:52:33 +0000
Subject: Move erlang-sd_notify to openstack-service stratum

erlang-sd_notify is required only, at the moment, by rabbitmq server
to be able to send notifications to systemd, so makes sense for it
to belongs only to openstack-service stratum making the erlang
stratum minimal. This movement makes erlang stratum not depends on
systemd (because erlang-sd_notify needs systemd headers to compile),
defo it can depends only in core stratum.

Change-Id: Ie6fbb58502336d21fa882bae09860a56d4c14a60
---
 strata/erlang.morph                              | 10 +---------
 strata/erlang/erlang-sd_notify.morph             |  8 --------
 strata/openstack-services.morph                  |  5 +++++
 strata/openstack-services/erlang-sd_notify.morph |  8 ++++++++
 4 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 strata/erlang/erlang-sd_notify.morph
 create mode 100644 strata/openstack-services/erlang-sd_notify.morph

diff --git a/strata/erlang.morph b/strata/erlang.morph
index d31e78cd..e9e61bea 100644
--- a/strata/erlang.morph
+++ b/strata/erlang.morph
@@ -2,7 +2,7 @@ name: erlang
 kind: stratum
 description: stratum for erlang/otp and stuff
 build-depends:
-- morph: strata/tools.morph
+- morph: strata/core.morph
 chunks:
 - name: erlang
   morph: strata/erlang/erlang.morph
@@ -16,11 +16,3 @@ chunks:
   unpretrify-ref: master
   build-depends:
   - erlang
-- name: erlang-sd_notify
-  morph: strata/erlang/erlang-sd_notify.morph
-  repo: upstream:erlang-modules/erlang-sd_notify
-  ref: 99f4689c2c18570680329f822591f95f9341ca10
-  unpretrify-ref: master
-  build-depends:
-  - erlang
-  - rebar
diff --git a/strata/erlang/erlang-sd_notify.morph b/strata/erlang/erlang-sd_notify.morph
deleted file mode 100644
index dd3f66ca..00000000
--- a/strata/erlang/erlang-sd_notify.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: erlang-sd_notify
-kind: chunk
-build-commands:
-- LDFLAGS=-lsystemd REBAR_FLAGS="--verbose 2" make
-install-commands:
-- install -D -m 644 -p ebin/sd_notify.app "$DESTDIR$PREFIX"/lib/erlang/lib/sd_notify-0.1/ebin/sd_notify.app
-- install -D -m 644 -p ebin/sd_notify.beam "$DESTDIR$PREFIX"/lib/erlang/lib/sd_notify-0.1/ebin/sd_notify.beam
-- install -D -m 755 -p priv/sd_notify_drv.so "$DESTDIR$PREFIX"/lib/erlang/lib/sd_notify-0.1/priv/sd_notify_drv.so
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index 081b97f3..484aa95f 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -9,6 +9,11 @@ build-depends:
 - morph: strata/test-tools.morph
 - morph: strata/python-tools.morph
 chunks:
+- name: erlang-sd_notify
+  morph: strata/openstack-services/erlang-sd_notify.morph
+  repo: upstream:erlang-modules/erlang-sd_notify
+  ref: 99f4689c2c18570680329f822591f95f9341ca10
+  unpretrify-ref: 0.1
 - name: rabbitmq-codegen
   morph: strata/openstack-services/rabbitmq-codegen.morph
   ref: 4dc5ccde2a0b3d638e5754b00abf94196fe9ca32
diff --git a/strata/openstack-services/erlang-sd_notify.morph b/strata/openstack-services/erlang-sd_notify.morph
new file mode 100644
index 00000000..dd3f66ca
--- /dev/null
+++ b/strata/openstack-services/erlang-sd_notify.morph
@@ -0,0 +1,8 @@
+name: erlang-sd_notify
+kind: chunk
+build-commands:
+- LDFLAGS=-lsystemd REBAR_FLAGS="--verbose 2" make
+install-commands:
+- install -D -m 644 -p ebin/sd_notify.app "$DESTDIR$PREFIX"/lib/erlang/lib/sd_notify-0.1/ebin/sd_notify.app
+- install -D -m 644 -p ebin/sd_notify.beam "$DESTDIR$PREFIX"/lib/erlang/lib/sd_notify-0.1/ebin/sd_notify.beam
+- install -D -m 755 -p priv/sd_notify_drv.so "$DESTDIR$PREFIX"/lib/erlang/lib/sd_notify-0.1/priv/sd_notify_drv.so
-- 
cgit v1.2.1