diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-23 10:06:30 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-23 10:06:30 +0000 |
| commit | c734592d9d9a08aa99803a9a86dcfbc6aab7c531 (patch) | |
| tree | efd1f52d6e4dbc30e69f4d60e6ff66279b95ba87 | |
| parent | 9e9dc7fda8d121669cfc464c17bf05c306c878ee (diff) | |
| parent | 2c04a362e8cac7093593364b1863ef30c0b185d2 (diff) | |
| download | morphs-c734592d9d9a08aa99803a9a86dcfbc6aab7c531.tar.gz | |
Merge remote branch 'origin/master' into rm/busyboxonly
| -rw-r--r-- | bootstrap-pass1.morph | 6 | ||||
| -rw-r--r-- | foundation.morph | 12 | ||||
| -rw-r--r-- | stories/login.py | 4 |
3 files changed, 15 insertions, 7 deletions
diff --git a/bootstrap-pass1.morph b/bootstrap-pass1.morph index 80514d2..995f612 100644 --- a/bootstrap-pass1.morph +++ b/bootstrap-pass1.morph @@ -3,7 +3,7 @@ "kind": "stratum", "sources": [ { - "repo": "binutils", + "repo": "binutils-redhat", "ref": "baserock/bootstrap-pass1", "name": "binutils-1" }, @@ -19,11 +19,11 @@ }, { "repo": "eglibc2", - "ref": "baserock/bootstrap-pass1", + "ref": "baserock/2.15-bootstrap-pass1", "name": "eglibc" }, { - "repo": "binutils", + "repo": "binutils-redhat", "ref": "baserock/bootstrap-pass1", "name": "binutils-2" }, diff --git a/foundation.morph b/foundation.morph index d372737..7d2114b 100644 --- a/foundation.morph +++ b/foundation.morph @@ -22,6 +22,18 @@ "morph": "busybox-devel", "repo": "busybox", "ref": "baserock/morph" + }, + { + "name": "attr", + "ref": "baserock/morph" + }, + { + "name": "util-linux", + "ref": "baserock/morph" + }, + { + "name": "btrfs-progs", + "ref": "baserock/morph" } ] } diff --git a/stories/login.py b/stories/login.py deleted file mode 100644 index f2af55c..0000000 --- a/stories/login.py +++ /dev/null @@ -1,4 +0,0 @@ -story = [ - ('', 'login: '), - ('root\r', '^~ # '), -] |