summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-03-04 16:06:25 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-03-17 11:24:25 +0000
commit526b10c718e2815bc67c865b520b5fb9de54f1bc (patch)
tree279ef8655707336ef1135749b77cd9caaba7c17b
parentd1078c682379fad05244a6189e5331627f6282f6 (diff)
downloaddefinitions-526b10c718e2815bc67c865b520b5fb9de54f1bc.tar.gz
Update python-lxml and move it to python-core stratum
This moves python-lxml to python-core to avoid duplication of chunks in strata when the openstack-services strata is merged into definition master. lxslt has been moved to core.morph because is a very common dependency and is a requirement for python-lxml.
-rw-r--r--strata/core.morph9
-rw-r--r--strata/foundation.morph4
-rw-r--r--strata/python-core.morph10
-rw-r--r--strata/virtualization.morph12
4 files changed, 20 insertions, 15 deletions
diff --git a/strata/core.morph b/strata/core.morph
index b424a023..963a89bb 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -273,3 +273,12 @@ chunks:
unpetrify-ref: baserock/v2.7.1
build-depends:
- shadow
+- name: libxslt
+ repo: upstream:libxslt
+ ref: 8785a2ffd0d146df0395ab71ce4734d0a8ba0f7e
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - autoconf-tarball
+ - libtool-tarball
+ - automake
+ - libxml2
diff --git a/strata/foundation.morph b/strata/foundation.morph
index eea872a8..7bcfc77d 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -135,10 +135,6 @@ chunks:
build-depends:
- glib
- systemd
-- name: libxslt
- repo: upstream:libxslt
- ref: 8785a2ffd0d146df0395ab71ce4734d0a8ba0f7e
- unpetrify-ref: baserock/morph
- name: openssh
morph: strata/foundation/openssh.morph
repo: upstream:openssh-git
diff --git a/strata/python-core.morph b/strata/python-core.morph
index 342e8c68..481f11bf 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -36,3 +36,13 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- python-setuptools
+- name: cython
+ repo: upstream:cython
+ ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d
+ unpetrify-ref: 0.22
+- name: python-lxml
+ repo: upstream:python-lxml
+ ref: 14505bc62f5f1fc9fb0ff007955f3e67ab4562bb
+ unpetrify-ref: lxml-3.4.0
+ build-depends:
+ - cython
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index 84eefdaf..54e15727 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -6,6 +6,7 @@ description: |
kernel history to check which config are needed for openvswitch, libvirt,
or ebtables, for example.
build-depends:
+- morph: strata/python-core.morph
- morph: strata/connman-common.morph
- morph: strata/lvm.morph
chunks:
@@ -66,23 +67,12 @@ chunks:
unpetrify-ref: master
build-depends:
- pycurl
-- name: cython
- repo: upstream:cython
- ref: 005d38d5921a603d5f4d413aae72f98a6d33192f
- unpetrify-ref: master
-- name: python-lxml
- repo: upstream:python-lxml
- ref: 8fc99f8ef3e2f12e74fb407ae62c5db50cfe7b92
- unpetrify-ref: baserock/morph
- build-depends:
- - cython
- name: libvirt-python
repo: upstream:libvirt-python
ref: 8e09c79a07b097a6ba9af83be4916fb9c9538500
unpetrify-ref: v1.2.10
build-depends:
- libvirt
- - python-lxml
- urlgrabber
- name: gnome-common
repo: upstream:gnome-common