summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-02-04 14:58:47 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-02-12 11:35:23 +0000
commit57ce68fea03e8985888ab2a875f5efbc79d7b07a (patch)
treeec6a9183a3c9471fa2c8ecbce608fb614a35a567
parent9979c36b008d1803d90fb4dfe849233b28b03196 (diff)
downloaddefinitions-57ce68fea03e8985888ab2a875f5efbc79d7b07a.tar.gz
Update to btrfs-progs v3.18.2
acl and e2fsprogs are new dependencies of btrfs-progs.
-rw-r--r--strata/foundation.morph19
-rw-r--r--strata/foundation/acl.morph4
-rw-r--r--strata/foundation/btrfs-progs.morph4
-rw-r--r--strata/foundation/e2fsprogs.morph (renamed from strata/tools/e2fsprogs.morph)4
-rw-r--r--strata/tools.morph6
5 files changed, 25 insertions, 12 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph
index dd89bac1..55a8edd9 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -115,14 +115,29 @@ chunks:
ref: d69e627e79862e2df4ff9ff1ddb0363c4520d8a8
unpetrify-ref: baserock/tiagogomes/armv8l64
build-depends: []
+- name: acl
+ morph: strata/foundation/acl.morph
+ repo: upstream:acl
+ ref: f13e09bd54fd4a501c4952f002ed2752bdd9f93b
+ unpetrify-ref: v2.2.52
+ build-depends:
+ - attr
+- name: e2fsprogs
+ morph: strata/foundation/e2fsprogs.morph
+ repo: upstream:e2fsprogs
+ ref: 6a3741ad293031447b95b88431eafa77401a8987
+ unpetrify-ref: v1.42.12
+ build-depends: []
- name: btrfs-progs
morph: strata/foundation/btrfs-progs.morph
repo: upstream:btrfs-progs
- ref: 304f215abb836811e6d78e0a3da53d48aa0e7ca7
- unpetrify-ref: baserock/morph
+ ref: 563ff3b07d85517e3589a1f2e6f45a8265e3f071
+ unpetrify-ref: v3.18.2
build-depends:
- attr
+ - acl
- lzo
+ - e2fsprogs
- name: dbus
morph: strata/foundation/dbus.morph
repo: upstream:dbus
diff --git a/strata/foundation/acl.morph b/strata/foundation/acl.morph
new file mode 100644
index 00000000..4489f5d5
--- /dev/null
+++ b/strata/foundation/acl.morph
@@ -0,0 +1,4 @@
+name: acl
+kind: chunk
+install-commands:
+- make DESTDIR="$DESTDIR" install-dev
diff --git a/strata/foundation/btrfs-progs.morph b/strata/foundation/btrfs-progs.morph
index 356c3f06..d5cb83f0 100644
--- a/strata/foundation/btrfs-progs.morph
+++ b/strata/foundation/btrfs-progs.morph
@@ -1,6 +1,6 @@
name: btrfs-progs
kind: chunk
build-commands:
-- make
+- make DISABLE_DOCUMENTATION=1
install-commands:
-- make DESTDIR="$DESTDIR" prefix="$PREFIX" install
+- make DESTDIR="$DESTDIR" prefix="$PREFIX" DISABLE_DOCUMENTATION=1 install
diff --git a/strata/tools/e2fsprogs.morph b/strata/foundation/e2fsprogs.morph
index 801f8abe..a57eb15a 100644
--- a/strata/tools/e2fsprogs.morph
+++ b/strata/foundation/e2fsprogs.morph
@@ -8,14 +8,14 @@ configure-commands:
# install it.
- |
./configure --prefix="$PREFIX" --sysconfdir=/etc \
- --disable-libuuid --disable-uuidd --disable-fsck
+ --disable-libuuid --disable-uuidd --disable-fsck --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 -name fsck \) -delete
find "$td" \( -name blkid.8 -o -name findfs.8 \) -delete
mv "$td"/* "$DESTDIR"
diff --git a/strata/tools.morph b/strata/tools.morph
index 4d8c3f44..1f2e9cde 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -10,12 +10,6 @@ chunks:
ref: c9691a9604fdf9d6711204999787d332b7141692
unpetrify-ref: baserock/morph
build-depends: []
-- name: e2fsprogs
- morph: strata/tools/e2fsprogs.morph
- repo: upstream:e2fsprogs
- ref: 6a3741ad293031447b95b88431eafa77401a8987
- unpetrify-ref: v1.42.12
- build-depends: []
- name: file
repo: upstream:file
ref: 3b49db406667ee7189b9ea69b9d9e0bdcc43c5b7