summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-03-04 16:06:25 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-03-04 17:17:20 (GMT)
commitcd6ce949aab5c2016bdebd9ee7fbaf2a63df85d0 (patch)
treef529433be2c0cbf3ab813fb5e34c9e2c7dd28fb8
parentbe2370b14f08d1d1e147aca382d56a830a1b4094 (diff)
downloaddefinitions-baserock/franred/move-lxml-to-foundation.tar.gz
Update lxml and move it to foundation stratumbaserock/franred/move-lxml-to-foundation
lxml will be duplicated in openstack-services and virtualization morphologies. lxml and cython are python packages which depend on lxslt and libxml2 which are C packages placed in foundation and core respectively, so moving them to foundation won't add C dependencies on python-* strata which can cause problems in the future when trying to compile with differents C toolchains.
-rw-r--r--strata/foundation.morph12
-rw-r--r--strata/virtualization.morph12
2 files changed, 12 insertions, 12 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 9a4a15e..ac1b88d 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -172,3 +172,15 @@ chunks:
build-depends:
- dbus
- glib
+- name: cython
+ repo: upstream:cython
+ ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d
+ unpetrify-ref: 0.22
+ build-depends: []
+- name: python-lxml
+ repo: upstream:python-lxml
+ ref: 14505bc62f5f1fc9fb0ff007955f3e67ab4562bb
+ unpetrify-ref: lxml-3.4.0
+ build-depends:
+ - cython
+ - libxslt
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index 1cd447a..e7e5682 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -73,24 +73,12 @@ chunks:
unpetrify-ref: master
build-depends:
- pycurl
-- name: cython
- repo: upstream:cython
- ref: 005d38d5921a603d5f4d413aae72f98a6d33192f
- unpetrify-ref: master
- build-depends: []
-- 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