summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-04-22 17:30:02 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-04-23 17:55:47 (GMT)
commit6f9c7077041a59ee9f319c5fc7c59a212768b4fd (patch)
tree88ff407418998cb389c70a01462fdb0c8b27dca0
parenteacdc2a50b1c4f519406f2c105e025f8f93bc0d1 (diff)
downloaddefinitions-6f9c7077041a59ee9f319c5fc7c59a212768b4fd.tar.gz
Add unionfs-fuse to Highbank systems
Other systems can use overlayfs, but we can't run Linux 3.18 on Highbank so must use unionfs-fuse for now instead. Change-Id: I26a4c1656298e071df31684bfe1dd616ecbf4558
-rw-r--r--strata/unionfs-fuse-group.morph21
-rw-r--r--strata/unionfs-fuse-group/unionfs-fuse.morph13
-rw-r--r--systems/build-system-armv7lhf-highbank.morph2
-rw-r--r--systems/devel-system-armv7-highbank.morph2
-rw-r--r--systems/devel-system-armv7b-highbank.morph2
-rw-r--r--systems/devel-system-armv7lhf-highbank.morph2
6 files changed, 42 insertions, 0 deletions
diff --git a/strata/unionfs-fuse-group.morph b/strata/unionfs-fuse-group.morph
new file mode 100644
index 0000000..914b18e
--- /dev/null
+++ b/strata/unionfs-fuse-group.morph
@@ -0,0 +1,21 @@
+name: unionfs-fuse-group
+kind: stratum
+
+description:
+ User-space union file system.
+
+ This is used by Morph for systems which are unable to use 'overlayfs'.
+ It is slower than 'overlayfs', because it runs outside rather than
+ inside the kernel, but 'overlayfs' is only available in Linux 3.18 and
+ newer.
+
+build-depends:
+# Depends on foundation for 'fuse', and maybe other stuff.
+- morph: strata/foundation.morph
+
+chunks:
+ - name: unionfs.fuse
+ morph: strata/unionfs-fuse-group/unionfs-fuse.morph
+ repo: upstream:unionfs-fuse
+ ref: efac5b7aa91ec860f8f430a8d21060fe53a07002
+ unpetrify-ref: v0.26
diff --git a/strata/unionfs-fuse-group/unionfs-fuse.morph b/strata/unionfs-fuse-group/unionfs-fuse.morph
new file mode 100644
index 0000000..9b8ac2c
--- /dev/null
+++ b/strata/unionfs-fuse-group/unionfs-fuse.morph
@@ -0,0 +1,13 @@
+name: unionfs-fuse
+kind: chunk
+
+description:
+ User-space union file system.
+
+build-system: manual
+
+build-commands:
+- make PREFIX="$PREFIX"
+
+install-commands:
+- make PREFIX="$PREFIX" DESTDIR="$DESTDIR" install
diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph
index 1f07556..08e7688 100644
--- a/systems/build-system-armv7lhf-highbank.morph
+++ b/systems/build-system-armv7lhf-highbank.morph
@@ -41,6 +41,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
+- name: unionfs-fuse-group
+ morph: strata/unionfs-fuse-group.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index 8e6905e..dae24ff 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -52,6 +52,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
+- name: unionfs-fuse-group
+ morph: strata/unionfs-fuse-group.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index a4f5792..b1710b7 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -48,6 +48,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
+- name: unionfs-fuse-group
+ morph: strata/unionfs-fuse-group.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index d793a12..928f9ce 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -55,6 +55,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
+- name: unionfs-fuse-group
+ morph: strata/unionfs-fuse-group.morph
configuration-extensions:
- set-hostname
- add-config-files