diff options
Diffstat (limited to 'strata')
-rw-r--r-- | strata/openstack-clients-full/pytz.morph | 1 | ||||
-rw-r--r-- | strata/openstack-clients.morph | 4 | ||||
-rw-r--r-- | strata/openstack-clients/pytz.morph | 4 | ||||
-rw-r--r-- | strata/openstack-common.morph | 7 |
4 files changed, 8 insertions, 8 deletions
diff --git a/strata/openstack-clients-full/pytz.morph b/strata/openstack-clients-full/pytz.morph index f5557946..56e9da10 100644 --- a/strata/openstack-clients-full/pytz.morph +++ b/strata/openstack-clients-full/pytz.morph @@ -1,6 +1,7 @@ name: pytz kind: chunk build-commands: +- make dist - cd src && python setup.py build install-commands: - cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR" diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph index 1b348630..2de645df 100644 --- a/strata/openstack-clients.morph +++ b/strata/openstack-clients.morph @@ -62,8 +62,8 @@ chunks: - name: pytz morph: strata/openstack-clients/pytz.morph repo: upstream:pytz - ref: 384207f01fd5b8bf1eb20cb64c17679084731944 - unpetrify-ref: baserock/morph + ref: 28a0d0bf56d35eeb1bb22a41755e029c7714f016 + unpetrify-ref: 28a0d0bf56d35eeb1bb22a41755e029c7714f016 build-depends: [] - name: babel repo: upstream:babel diff --git a/strata/openstack-clients/pytz.morph b/strata/openstack-clients/pytz.morph index f5557946..b8f3e7aa 100644 --- a/strata/openstack-clients/pytz.morph +++ b/strata/openstack-clients/pytz.morph @@ -1,6 +1,6 @@ name: pytz kind: chunk build-commands: -- cd src && python setup.py build +- python setup.py build install-commands: -- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR" +- python setup.py install --prefix "$PREFIX" --root "$DESTDIR" diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph index 494a9cae..4fb63e2c 100644 --- a/strata/openstack-common.morph +++ b/strata/openstack-common.morph @@ -6,6 +6,7 @@ description: | build-depends: - morph: strata/foundation.morph - morph: strata/python-core.morph +- morph: strata/tools.morph chunks: - name: pycparser repo: upstream:python-packages/pycparser @@ -19,12 +20,10 @@ chunks: build-depends: - pycparser - name: pytz -# TODO: Rebase baserock/morph with the latest stable -# tag. morph: strata/openstack-clients/pytz.morph repo: upstream:pytz - ref: 384207f01fd5b8bf1eb20cb64c17679084731944 - unpetrify-ref: baserock/morph + ref: 28a0d0bf56d35eeb1bb22a41755e029c7714f016 + unpetrify-ref: 28a0d0bf56d35eeb1bb22a41755e029c7714f016 build-depends: [] - name: python-requests repo: upstream:python-requests |