summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-01-14 17:41:47 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2013-01-14 17:41:47 +0000
commit13856b9ce7900a42cb53af6c299110b80c37319b (patch)
tree9ac49eae8465434d9de6f33b956b45a7902aba15
parent00573515b7f17ce3621abfe2d8a4e8f659f78c1d (diff)
parent6b35744da2cd19a5858b6857d4b27598a80c2373 (diff)
downloaddefinitions-13856b9ce7900a42cb53af6c299110b80c37319b.tar.gz
Merge branch 'baserock/samthursfield/nfs' of git://git.baserock.org/baserock/baserock/morphs
-rw-r--r--base-system-x86_64-generic.morph5
-rw-r--r--bsp-x86_64-generic.morph4
-rw-r--r--nfs.morph51
3 files changed, 59 insertions, 1 deletions
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 94c93ff1..eb75377c 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -15,6 +15,11 @@
"morph": "foundation",
"repo": "baserock:baserock/morphs",
"ref": "master"
+ },
+ {
+ "morph": "nfs",
+ "repo": "baserock:baserock/morphs",
+ "ref": "master"
}
]
}
diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph
index ae5a3b07..954b7b54 100644
--- a/bsp-x86_64-generic.morph
+++ b/bsp-x86_64-generic.morph
@@ -19,7 +19,9 @@
"name": "syslinux",
"repo": "upstream:syslinux",
"ref": "baserock/morph",
- "build-depends": ["nasm"]
+ "build-depends": [
+ "nasm"
+ ]
}
]
}
diff --git a/nfs.morph b/nfs.morph
new file mode 100644
index 00000000..c85877f5
--- /dev/null
+++ b/nfs.morph
@@ -0,0 +1,51 @@
+{
+ "name": "nfs",
+ "kind": "stratum",
+ "description": "NFS utilities",
+ "chunks": [
+ {
+ "name": "libevent",
+ "repo": "upstream:libevent",
+ "ref": "release-2.0.20-stable",
+ "build-depends": []
+ },
+ {
+ "name": "sqlite3",
+ "repo": "upstream:sqlite3",
+ "ref": "master",
+ "build-depends": []
+ },
+ {
+ "name": "tcp-wrappers",
+ "repo": "upstream:tcp-wrappers",
+ "ref": "baserock/fedora-patches",
+ "build-depends": []
+ },
+ {
+ "name": "ti-rpc",
+ "repo": "upstream:ti-rpc",
+ "ref": "baserock/master",
+ "build-depends": []
+ },
+ {
+ "name": "rpcbind",
+ "repo": "upstream:rpcbind",
+ "ref": "baserock/master",
+ "build-depends": [
+ "ti-rpc",
+ "tcp-wrappers"
+ ]
+ },
+ {
+ "name": "nfs-utils",
+ "repo": "upstream:nfs-utils",
+ "ref": "baserock/master",
+ "build-depends": [
+ "libevent",
+ "sqlite3",
+ "tcp-wrappers",
+ "ti-rpc"
+ ]
+ }
+ ]
+}