From b406e5a77c33ca76c46e143e591dbd55eaa65d17 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 16 Sep 2014 10:03:27 +0100
Subject: Copy e2fsprogs morphology from chunk repo baserock/morph branch

When the organise-morphologies.py script pulled this in it to
definitions.git it must have lost the comments. It's good to keep
them there.
---
 strata/tools/e2fsprogs.morph | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/strata/tools/e2fsprogs.morph b/strata/tools/e2fsprogs.morph
index 9d3b32a8..801f8abe 100644
--- a/strata/tools/e2fsprogs.morph
+++ b/strata/tools/e2fsprogs.morph
@@ -2,10 +2,17 @@ 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-fsck
 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
-- 
cgit v1.2.1


From 977244b445658941189d9fbbfc718b80dc210df6 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 16 Sep 2014 10:06:32 +0100
Subject: Update e2fsprogs to latest stable (v1.42.12)

This was motivated by commit 5c15bf5f978bae01f1ca3cbe6414ab1d355a6adf
which fixes a Makefile issue that was causing intermittent build
failures when using parallel make.
---
 strata/tools.morph | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strata/tools.morph b/strata/tools.morph
index 590d75d5..6ee70fdb 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -62,8 +62,8 @@ chunks:
 - name: e2fsprogs
   morph: strata/tools/e2fsprogs.morph
   repo: upstream:e2fsprogs
-  ref: 485edc675200ff3097cec521c357441a1c2d9b0d
-  unpetrify-ref: baserock/morph
+  ref: 6a3741ad293031447b95b88431eafa77401a8987
+  unpetrify-ref: v1.42.12
   build-depends: []
 - name: file
   repo: upstream:file
-- 
cgit v1.2.1