summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2015-02-18 11:18:36 +0000
committerMorph (on behalf of Adam Coldrick) <adam.coldrick@codethink.co.uk>2015-02-18 11:18:36 +0000
commita1708b9ba42cb14a0c3a1d1cfe6a37a14568238b (patch)
treee56753b55e19a87f7d143fc2f1d3859f42c7a43c
parent54e269a9805e9cf50d0fe3075c04cfc1d1676a88 (diff)
downloaddefinitions-a1708b9ba42cb14a0c3a1d1cfe6a37a14568238b.tar.gz
Morph build d6f17e66de784d13b9bf084d7f424027
System branch: master
-rw-r--r--strata/bsp-x86_64-generic/linux-x86-64-generic.morph2
-rw-r--r--strata/morph-utils.morph5
-rw-r--r--strata/tools/e2fsprogs.morph1
-rw-r--r--systems/devel-system-x86_64-generic.morph2
4 files changed, 5 insertions, 5 deletions
diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
index a7f1d735..fe0721cc 100644
--- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
+++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
@@ -45,8 +45,6 @@ configure-commands:
- scripts/config -e BLK_DEV_LOOP
- scripts/config -d BLK_DEV_CRYPTOLOOP
- scripts/config -e CEPH_FS
-- scripts/config -e OVERLAY_FS
-- scripts/config -e FUSE_FS
- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8
- scripts/config -e VIRTIO
- scripts/config -e VIRTIO_RING
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
index 95d9807c..0b3a3ff3 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -69,6 +69,11 @@ chunks:
ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70
unpetrify-ref: baserock/morph
build-depends: []
+- name: pylru
+ repo: upstream:pylru
+ ref: 221dd259f5c34562c835611d1cf62384b9019da4
+ unpetrify-ref: master
+ build-depends: []
- name: morph
repo: baserock:baserock/morph
ref: f0c5d4c0ef35cc43aa059cd2255e41c60c4cac77
diff --git a/strata/tools/e2fsprogs.morph b/strata/tools/e2fsprogs.morph
index db1ea4cc..9d3b32a8 100644
--- a/strata/tools/e2fsprogs.morph
+++ b/strata/tools/e2fsprogs.morph
@@ -9,7 +9,6 @@ install-commands:
- |
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/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index 95e27414..32ddfc56 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -36,8 +36,6 @@ strata:
morph: strata/python-tools.morph
- name: devtools
morph: strata/devtools.morph
-- name: ostree-core
- morph: strata/ostree-core.morph
configuration-extensions:
- set-hostname
- add-config-files