From 508d657dd94478d41eb1ec93a1c1556c607d55e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <javier.jardon@codethink.co.uk>
Date: Tue, 19 May 2015 15:45:20 +0100
Subject: 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
---
 strata/core.morph                 |  8 ++++++++
 strata/core/e2fsprogs.morph       | 22 ++++++++++++++++++++++
 strata/foundation.morph           |  6 ------
 strata/foundation/e2fsprogs.morph | 22 ----------------------
 strata/ostree-core.morph          |  1 -
 5 files changed, 30 insertions(+), 29 deletions(-)
 create mode 100644 strata/core/e2fsprogs.morph
 delete mode 100644 strata/foundation/e2fsprogs.morph

diff --git a/strata/core.morph b/strata/core.morph
index 7f30de1c..5e3aab58 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/core/e2fsprogs.morph b/strata/core/e2fsprogs.morph
new file mode 100644
index 00000000..55ac486c
--- /dev/null
+++ b/strata/core/e2fsprogs.morph
@@ -0,0 +1,22 @@
+name: e2fsprogs
+kind: chunk
+build-system: autotools
+configure-commands:
+# Configure with the usual paths for binaries and config
+# but also disable whatever we can that is already provided by util-linux
+# Disabling e2fsprofs' libblkid does not work, but we don't have to
+# install it.
+- |
+  ./configure --prefix="$PREFIX" --sysconfdir=/etc \
+    --disable-libuuid --disable-uuidd --disable-libblkid
+install-commands:
+# e2fsprogs also includes tools that are provided by util-linux, so we
+# need to selectively exclude them.  Removing them directly from DESTDIR
+# causes problems, so we need to remove them beforehand.
+- |
+  td="$(mktemp -d)"
+  make DESTDIR="$td" install
+  make DESTDIR="$td" install-libs
+  find "$td" \( -name blkid -o -name findfs -o \) -delete
+  find "$td" \( -name blkid.8 -o -name findfs.8 \) -delete
+  mv "$td"/* "$DESTDIR"
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 6836fbea..595a409f 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/foundation/e2fsprogs.morph b/strata/foundation/e2fsprogs.morph
deleted file mode 100644
index 55ac486c..00000000
--- a/strata/foundation/e2fsprogs.morph
+++ /dev/null
@@ -1,22 +0,0 @@
-name: e2fsprogs
-kind: chunk
-build-system: autotools
-configure-commands:
-# Configure with the usual paths for binaries and config
-# but also disable whatever we can that is already provided by util-linux
-# Disabling e2fsprofs' libblkid does not work, but we don't have to
-# install it.
-- |
-  ./configure --prefix="$PREFIX" --sysconfdir=/etc \
-    --disable-libuuid --disable-uuidd --disable-libblkid
-install-commands:
-# e2fsprogs also includes tools that are provided by util-linux, so we
-# need to selectively exclude them.  Removing them directly from DESTDIR
-# causes problems, so we need to remove them beforehand.
-- |
-  td="$(mktemp -d)"
-  make DESTDIR="$td" install
-  make DESTDIR="$td" install-libs
-  find "$td" \( -name blkid -o -name findfs -o \) -delete
-  find "$td" \( -name blkid.8 -o -name findfs.8 \) -delete
-  mv "$td"/* "$DESTDIR"
diff --git a/strata/ostree-core.morph b/strata/ostree-core.morph
index 5052bf4b..bcf7d61b 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:
-- 
cgit v1.2.1