summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2015-05-19 14:45:20 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-05-19 15:37:21 (GMT)
commit508d657dd94478d41eb1ec93a1c1556c607d55e6 (patch)
treead435e40d152414b1f5dcd94145842c8a9b01781
parent10d47bb5a09f8ae20879a17cc01039797a16621a (diff)
downloaddefinitions-508d657dd94478d41eb1ec93a1c1556c607d55e6.tar.gz
Move e2fsprogs from foundation to core stratum
So cross- systems doesnt depend on the whole foundation (cross- systems include morph, which depends on ostree, wich depends on e2fsprogs) Change-Id: I77918e2a2a66e9bd7c8ce77d2447e390d192a1c8
-rw-r--r--strata/core.morph8
-rw-r--r--strata/core/e2fsprogs.morph (renamed from strata/foundation/e2fsprogs.morph)0
-rw-r--r--strata/foundation.morph6
-rw-r--r--strata/ostree-core.morph1
4 files changed, 8 insertions, 7 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 7f30de1..5e3aab5 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -374,3 +374,11 @@ chunks:
- glib
- libffi
- pkg-config
+- name: e2fsprogs
+ morph: strata/core/e2fsprogs.morph
+ repo: upstream:e2fsprogs
+ ref: 6a3741ad293031447b95b88431eafa77401a8987
+ unpetrify-ref: v1.42.12
+ build-depends:
+ - pkg-config
+ - util-linux
diff --git a/strata/foundation/e2fsprogs.morph b/strata/core/e2fsprogs.morph
index 55ac486..55ac486 100644
--- a/strata/foundation/e2fsprogs.morph
+++ b/strata/core/e2fsprogs.morph
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 6836fbe..595a409 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -74,11 +74,6 @@ chunks:
repo: upstream:fuse
ref: d69e627e79862e2df4ff9ff1ddb0363c4520d8a8
unpetrify-ref: baserock/morph
-- name: e2fsprogs
- morph: strata/foundation/e2fsprogs.morph
- repo: upstream:e2fsprogs
- ref: 6a3741ad293031447b95b88431eafa77401a8987
- unpetrify-ref: v1.42.12
- name: btrfs-progs
morph: strata/foundation/btrfs-progs.morph
repo: upstream:btrfs-progs
@@ -86,7 +81,6 @@ chunks:
unpetrify-ref: v4.0
build-depends:
- lzo
- - e2fsprogs
- name: dbus
morph: strata/foundation/dbus.morph
repo: upstream:dbus
diff --git a/strata/ostree-core.morph b/strata/ostree-core.morph
index 5052bf4..bcf7d61 100644
--- a/strata/ostree-core.morph
+++ b/strata/ostree-core.morph
@@ -1,7 +1,6 @@
name: ostree-core
kind: stratum
build-depends:
-- morph: strata/foundation.morph
- morph: strata/core.morph
- morph: strata/libsoup-common.morph
chunks: