diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-19 16:03:58 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-19 16:03:58 +0000 |
commit | 0e299c5ab13d45991ae0830525fc1cbad01ee913 (patch) | |
tree | 03e879d740dcb229e9d7d6e485365c3c24dba6b5 | |
parent | b40ceb5f1e12c7bb89ef9334439751d14abf6d5d (diff) | |
parent | 5b6890f2fea6a19c1a85198656e40a10fa1b3428 (diff) | |
download | morphs-0e299c5ab13d45991ae0830525fc1cbad01ee913.tar.gz |
Merge branch 'master' into rm/morph-pass1
-rw-r--r-- | base-system.morph | 2 | ||||
-rw-r--r-- | bootstrap-pass2.morph | 236 | ||||
-rw-r--r-- | devel.morph | 5 | ||||
-rw-r--r-- | foundation.morph | 6 |
4 files changed, 243 insertions, 6 deletions
diff --git a/base-system.morph b/base-system.morph index a9b7809..6a8c971 100644 --- a/base-system.morph +++ b/base-system.morph @@ -1,7 +1,7 @@ { "name": "base", "kind": "system", - "disk-size": "1G", + "disk-size": "10G", "strata": [ "foundation", "linux-stratum" diff --git a/bootstrap-pass2.morph b/bootstrap-pass2.morph new file mode 100644 index 0000000..146c981 --- /dev/null +++ b/bootstrap-pass2.morph @@ -0,0 +1,236 @@ +{ + "name": "bootstrap-pass2", + "kind": "stratum", + "sources": [ + { + "name": "fhs-dirs", + "ref": "master" + }, + { + "name": "linux-api-headers", + "repo": "linux", + "ref": "baserock/morph" + }, + { + "name": "eglibc-runtime", + "morph": "eglibc", + "repo": "eglibc2", + "ref": "baserock/morph" + }, + { + "name": "zlib", + "ref": "baserock/morph" + }, + { + "name": "binutils", + "ref": "baserock/bootstrap" + }, + { + "name": "gcc", + "repo": "gcc-tarball", + "ref": "baserock/bootstrap" + }, + { + "name": "sed", + "ref": "baserock/bootstrap" + }, + { + "name": "bzip2", + "ref": "baserock/morph" + }, + { + "name": "ncurses", + "ref": "baserock/morph" + }, + { + "name": "util-linux", + "ref": "baserock/bootstrap" + }, + { + "name": "psmisc", + "ref": "baserock/bootstrap" + }, + { + "name": "e2fsprogs", + "ref": "baserock/bootstrap" + }, + { + "name": "gperf", + "ref": "baserock/morph" + }, + { + "name": "coreutils", + "ref": "baserock/bootstrap" + }, + { + "name": "iana-etc", + "ref": "baserock/morph" + }, + { + "name": "m4", + "ref": "baserock/bootstrap" + }, + { + "name": "bison", + "ref": "baserock/bootstrap" + }, + { + "name": "procps", + "ref": "baserock/morph" + }, + { + "name": "grep", + "ref": "baserock/bootstrap" + }, + { + "name": "readline", + "ref": "baserock/morph" + }, + { + "name": "bash", + "ref": "baserock/morph" + }, + { + "name": "gdbm", + "ref": "baserock/bootstrap" + }, + { + "name": "perl", + "ref": "baserock/morph" + }, + { + "name": "autoconf", + "ref": "baserock/bootstrap" + }, + { + "name": "automake", + "ref": "baserock/morph" + }, + { + "name": "libtool", + "ref": "baserock/bootstrap" + }, + { + "name": "diffutils", + "ref": "baserock/bootstrap" + }, + { + "name": "gawk", + "ref": "baserock/morph" + }, + { + "name": "findutils", + "ref": "baserock/bootstrap" + }, + { + "name": "help2man", + "ref": "baserock/morph" + }, + { + "name": "flex", + "ref": "baserock/bootstrap" + }, + { + "name": "gettext", + "ref": "baserock/bootstrap" + }, + { + "name": "pkg-config", + "ref": "baserock/bootstrap" + }, + { + "name": "groff", + "ref": "baserock/morph" + }, + { + "name": "rsync", + "ref": "baserock/morph" + }, + { + "name": "gzip", + "ref": "baserock/morph" + }, + { + "name": "libpipeline", + "ref": "baserock/morph" + }, + { + "name": "gmp", + "ref": "baserock/morph" + }, + { + "name": "libnettle", + "repo": "lsh", + "ref": "baserock/morph" + }, + { + "name": "gnutls", + "ref": "baserock/morph" + }, + { + "name": "wget", + "ref": "baserock/morph" + }, + { + "name": "make", + "ref": "baserock/morph" + }, + { + "name": "xz", + "ref": "baserock/morph" + }, + { + "name": "patch", + "ref": "baserock/morph" + }, + { + "name": "tar", + "ref": "baserock/morph" + }, + { + "name": "texinfo-tarball", + "ref": "baserock/morph" + }, + { + "name": "vim", + "ref": "baserock/morph" + }, + { + "name": "libexpat", + "ref": "baserock/morph" + }, + { + "name": "curl", + "ref": "baserock/morph" + }, + { + "name": "openssl", + "ref": "baserock/morph" + }, + { + "name": "python", + "ref": "baserock/morph-2.7" + }, + { + "name": "cliapp", + "ref": "baserock/morph" + }, + { + "name": "git", + "ref": "baserock/morph" + }, + { + "name": "sudo", + "ref": "baserock/morph" + }, + { + "name": "busybox-devel", + "repo": "busybox", + "ref": "baserock/morph" + }, + { + "name": "linux", + "ref": "baserock/morph" + } + ] +} diff --git a/devel.morph b/devel.morph index c9c8864..1835200 100644 --- a/devel.morph +++ b/devel.morph @@ -223,11 +223,6 @@ "ref": "baserock/morph" }, { - "name": "busybox-devel", - "repo": "busybox", - "ref": "baserock/morph" - }, - { "name": "nasm", "ref": "baserock/morph" }, diff --git a/foundation.morph b/foundation.morph index 9e74e5c..59ac24e 100644 --- a/foundation.morph +++ b/foundation.morph @@ -16,6 +16,12 @@ "morph": "eglibc", "repo": "eglibc2", "ref": "baserock/morph" + }, + { + "name": "busybox-devel", + "morph": "busybox-devel", + "repo": "busybox", + "ref": "baserock/morph" } ] } |