diff options
| author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2014-10-08 08:39:12 +0000 |
|---|---|---|
| committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2014-10-13 15:04:20 +0000 |
| commit | 95dcc83d767dfcaa659e1e721bbcd1a9371b9365 (patch) | |
| tree | 7ae937ee453d2c937bf77ec53abd6d2d7583dea4 | |
| parent | c7a949d1878d4f78978bd27399a3dedc29499e17 (diff) | |
| download | definitions-95dcc83d767dfcaa659e1e721bbcd1a9371b9365.tar.gz | |
Add rabbitmq-codegen needed to compile rabbitmq-server
rabbitmq-codegen is needed to compile rabbitmq-server.
rabbitmq-server Makefile expects to have rabbitmq-codegen in
a relative path "../rabbitmq-codegen" or in a internal
directory called "codegen", this patch uses the latest
option.
| -rw-r--r-- | strata/openstack-services.morph | 5 | ||||
| -rw-r--r-- | strata/openstack-services/rabbitmq-codegen.morph | 7 | ||||
| -rw-r--r-- | strata/openstack-services/rabbitmq-server.morph | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph index 20aa3939..abc6def6 100644 --- a/strata/openstack-services.morph +++ b/strata/openstack-services.morph @@ -276,6 +276,11 @@ chunks: ref: master repo: upstream:python-packages/retrying - build-depends: [pbr] + name: rabbitmq-codegen + morph: strata/openstack-services/rabbitmq-codegen.morph + ref: master + repo: upstream:rabbitmq-codegen +- build-depends: [pbr, rabbitmq-codegen] morph: strata/openstack-services/rabbitmq-server.morph name: rabbitmq-server ref: master diff --git a/strata/openstack-services/rabbitmq-codegen.morph b/strata/openstack-services/rabbitmq-codegen.morph new file mode 100644 index 00000000..2b06aeb5 --- /dev/null +++ b/strata/openstack-services/rabbitmq-codegen.morph @@ -0,0 +1,7 @@ +name: rabbitmq-codegen +kind: chunk +configure-commands: [] +build-commands: [] +install-commands: +- mkdir -p "$DESTDIR$PREFIX"/lib/rabbitmq-codegen +- cp * "$DESTDIR$PREFIX"/lib/rabbitmq-codegen diff --git a/strata/openstack-services/rabbitmq-server.morph b/strata/openstack-services/rabbitmq-server.morph index e0f26be4..bf6d727d 100644 --- a/strata/openstack-services/rabbitmq-server.morph +++ b/strata/openstack-services/rabbitmq-server.morph @@ -1,6 +1,8 @@ name: rabbitmq-server kind: chunk configure-commands: +- mkdir -p codegen +- cp /usr/lib/rabbitmq-codegen/* codegen build-commands: - make install-commands: |