diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-07-08 14:39:49 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-07-27 16:22:18 +0000 |
| commit | 6f8159e34ebfc61a5fbe55007b66b172affc1d92 (patch) | |
| tree | 9b0f6e65a5e5c78c2e78f93ac2542387afb640dc | |
| parent | 8202481dbe5f04c5191a05df6438877ad4e23597 (diff) | |
| download | definitions-6f8159e34ebfc61a5fbe55007b66b172affc1d92.tar.gz | |
WIP: Add rsyslog to bosh-stemcell stratum
Also add dependencies
WIP: docutils can't go here, it will duplicate the one in
openstack
WIP: Depends on audio-bluetooth for json-c. Can this be moved?
Change-Id: Ie6d0ad04966e704baec9bdfaa04e7304613c6a50
| -rw-r--r-- | strata/bosh-stemcell.morph | 26 | ||||
| -rw-r--r-- | strata/bosh-stemcell/liblogging.morph | 7 | ||||
| -rw-r--r-- | strata/bosh-stemcell/librelp.morph | 6 | ||||
| -rw-r--r-- | strata/bosh-stemcell/rsyslog.morph | 6 | ||||
| -rw-r--r-- | systems/bosh-stemcell-x86_64-generic.morph | 3 |
5 files changed, 48 insertions, 0 deletions
diff --git a/strata/bosh-stemcell.morph b/strata/bosh-stemcell.morph index d969b264..40222736 100644 --- a/strata/bosh-stemcell.morph +++ b/strata/bosh-stemcell.morph @@ -2,8 +2,34 @@ name: bosh-stemcell kind: stratum build-depends: - morph: strata/core.morph +- morph: strata/audio-bluetooth.morph chunks: - name: monit morph: strata/bosh-stemcell/monit.morph repo: https://bitbucket.org/tildeslash/monit.git ref: release-5-14-0 +- name: libestr + repo: git://github.com/rsyslog/libestr.git + ref: v0.1.10 +- name: docutils + repo: upstream:python-packages/docutils + ref: 1976ba91eff979abc3e13e5d8cb68324833af6a0 + unpetrify-ref: docutils-0.12 +- name: librelp + morph: strata/bosh-stemcell/librelp.morph + repo: git://github.com/palvarez89/librelp + ref: fix-disable-tls +- name: liblogging + repo: git://github.com/rsyslog/liblogging + ref: v1.0.5 + build-depends: + - docutils +- name: rsyslog + morph: strata/bosh-stemcell/rsyslog.morph + repo: git://github.com/rsyslog/rsyslog.git + ref: v8.11.0 + build-depends: + - libestr + - liblogging + - librelp + - docutils diff --git a/strata/bosh-stemcell/liblogging.morph b/strata/bosh-stemcell/liblogging.morph new file mode 100644 index 00000000..d02ed361 --- /dev/null +++ b/strata/bosh-stemcell/liblogging.morph @@ -0,0 +1,7 @@ +name: liblogging +kind: chunk +build-system: autotools +configure-commands: +- autoreconf -ivf +- ./configure --prefix="$PREFIX" +#--disable-man-pages diff --git a/strata/bosh-stemcell/librelp.morph b/strata/bosh-stemcell/librelp.morph new file mode 100644 index 00000000..40d00760 --- /dev/null +++ b/strata/bosh-stemcell/librelp.morph @@ -0,0 +1,6 @@ +name: librelp +kind: chunk +build-system: autotools +configure-commands: +- autoreconf -ivf +- ./configure --prefix="$PREFIX" --disable-tls diff --git a/strata/bosh-stemcell/rsyslog.morph b/strata/bosh-stemcell/rsyslog.morph new file mode 100644 index 00000000..a0721f41 --- /dev/null +++ b/strata/bosh-stemcell/rsyslog.morph @@ -0,0 +1,6 @@ +name: rsyslog +kind: chunk +build-system: autotools +configure-commands: +- autoreconf -ivf +- ./configure --prefix="$PREFIX" --enable-relp diff --git a/systems/bosh-stemcell-x86_64-generic.morph b/systems/bosh-stemcell-x86_64-generic.morph index 7f7f6d28..deebf990 100644 --- a/systems/bosh-stemcell-x86_64-generic.morph +++ b/systems/bosh-stemcell-x86_64-generic.morph @@ -17,9 +17,12 @@ strata: morph: strata/bosh-stemcell.morph - name: ntpd morph: strata/ntpd.morph +- name: audio-bluetooth + morph: strata/audio-bluetooth.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files - extensions/nfsboot - extensions/install-files - extensions/install-essential-files +- extensions/bosh-stemcell |