summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-14 12:20:37 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-05-15 10:47:38 (GMT)
commit4da9f458fd11944c3ef408d3c7122940d79a2154 (patch)
treedc04bd37d90b4e2fab12b1dc43018f87ec3e92f0
parent8628d4eb91e60c563dc90063b3e7b986f90ff2dc (diff)
downloaddefinitions-4da9f458fd11944c3ef408d3c7122940d79a2154.tar.gz
Update to btrfs-progs 4.0
Change-Id: I1a3c6c9308c79ee81b74c15aee40bffdca312736
-rw-r--r--strata/foundation.morph4
-rw-r--r--strata/foundation/btrfs-progs.morph9
2 files changed, 7 insertions, 6 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 29473e6..6836fbe 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -82,8 +82,8 @@ chunks:
- name: btrfs-progs
morph: strata/foundation/btrfs-progs.morph
repo: upstream:btrfs-progs
- ref: 563ff3b07d85517e3589a1f2e6f45a8265e3f071
- unpetrify-ref: v3.18.2
+ ref: 19a806f575cd010734fa5793c4b3bfb49926dc62
+ unpetrify-ref: v4.0
build-depends:
- lzo
- e2fsprogs
diff --git a/strata/foundation/btrfs-progs.morph b/strata/foundation/btrfs-progs.morph
index d5cb83f..31e9270 100644
--- a/strata/foundation/btrfs-progs.morph
+++ b/strata/foundation/btrfs-progs.morph
@@ -1,6 +1,7 @@
name: btrfs-progs
kind: chunk
-build-commands:
-- make DISABLE_DOCUMENTATION=1
-install-commands:
-- make DESTDIR="$DESTDIR" prefix="$PREFIX" DISABLE_DOCUMENTATION=1 install
+build-system: autotools
+pre-configure-commands:
+- ./autogen.sh
+configure-commands:
+- ./configure --prefix="$PREFIX" --disable-documentation