diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-04-18 11:22:29 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-04-19 11:00:48 +0100 |
| commit | 26b7efba1fcafee1c97d55b4c6ef48222a6e0cc3 (patch) | |
| tree | 61c3faac39482d4e9085a0a1f65b8357296db7d1 | |
| parent | dc3962540fd6bc865e899a58214705a693b29a33 (diff) | |
| download | morphs-26b7efba1fcafee1c97d55b4c6ef48222a6e0cc3.tar.gz | |
bootstrap: add linux-user-chroot
It builds just like autotools, so its morphology can be inferred
for pass 2 and devel, but pass 1 needs some configuration because
the headers needed to build it aren't in debian squeeze.
autogen.sh uses `which` to test whether autoreconf exists, which
we only have in busybox, which wasn't built in pass 1. It is built
later in pass 2, so it is easier to build linux-user-chroot later.
Also remove sudo from bootstrap, we don't use it.
| -rw-r--r-- | bootstrap-pass1.morph | 7 | ||||
| -rw-r--r-- | bootstrap-pass2.morph | 14 | ||||
| -rw-r--r-- | devel.morph | 9 |
3 files changed, 26 insertions, 4 deletions
diff --git a/bootstrap-pass1.morph b/bootstrap-pass1.morph index a876102..9480a4d 100644 --- a/bootstrap-pass1.morph +++ b/bootstrap-pass1.morph @@ -170,6 +170,13 @@ "curl", "openssl" ] + }, + { + "name": "linux-user-chroot", + "ref": "baserock/bootstrap", + "build-depends": [ + "gcc-bootstrap-pass1-2" + ] } ] } diff --git a/bootstrap-pass2.morph b/bootstrap-pass2.morph index 1505774..247086e 100644 --- a/bootstrap-pass2.morph +++ b/bootstrap-pass2.morph @@ -226,14 +226,20 @@ "ref": "baserock/morph" }, { - "name": "sudo", - "ref": "baserock/morph" - }, - { "name": "busybox-devel", "repo": "busybox", "ref": "baserock/morph" }, + { + "name": "linux-user-chroot", + "ref": "master", + "build-depends": [ + "busybox-devel", + "autoconf", + "automake", + "libtool" + ] + }, { "name": "linux", "ref": "baserock/morph" diff --git a/devel.morph b/devel.morph index e3bf568..a56816a 100644 --- a/devel.morph +++ b/devel.morph @@ -139,6 +139,15 @@ "ref": "baserock/morph" }, { + "name": "linux-user-chroot", + "ref": "master", + "build-depends": [ + "autoconf", + "automake", + "libtool" + ] + }, + { "name": "groff", "ref": "baserock/morph" }, |