summaryrefslogtreecommitdiff
path: root/core.morph
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2013-03-15 16:27:23 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2013-03-15 16:27:23 +0000
commit22fc9595e15db3545a1fd01a41406ca710f0c817 (patch)
treedfe05ac29d7800cf066ee7b88e32f3b5c02788f1 /core.morph
parent04693fe707b8651ab9c14b4dbcc1f2479cde4aea (diff)
parent1f3c22493494b14760262be4782182ec67a59fa5 (diff)
downloaddefinitions-22fc9595e15db3545a1fd01a41406ca710f0c817.tar.gz
Merge branch 'baserock/samthursfield/build-essential-2-rebase'
Baserock no longer requires a staging filler to build. Instead, the tools of the host system are used to bootstrap a compiler which then builds the rest of the system in a staging chroot, as was previously done with the staging filler. There are likely to be errors if you do try to build with a staging filler, because it will interfere with the build-essential bootstrap process. Versions of Morph before the following commit can no longer build Baserock systems: commit 13cded5a796889c748e60ffa17fc92bad592bf39 Merge: 8046bf0 4b5f45f Author: Sam Thursfield <sam.thursfield@codethink.co.uk> Date: Fri Mar 15 11:05:07 2013 +0000 Merge branch 'samthursfield/arch' Reviewed-By: concensus
Diffstat (limited to 'core.morph')
-rw-r--r--core.morph14
1 files changed, 3 insertions, 11 deletions
diff --git a/core.morph b/core.morph
index 56c046bb..eb99e691 100644
--- a/core.morph
+++ b/core.morph
@@ -5,7 +5,7 @@
"build-depends": [
{
"repo": "baserock:baserock/morphs",
- "ref": "master",
+ "ref": "baserock/samthursfield/build-essential-2-rebase",
"morph": "build-essential"
}
],
@@ -77,12 +77,6 @@
]
},
{
- "name": "zlib",
- "repo": "upstream:zlib",
- "ref": "baserock/morph",
- "build-depends": []
- },
- {
"name": "autoconf",
"repo": "upstream:autoconf",
"ref": "baserock/build-essential",
@@ -139,8 +133,7 @@
"ref": "baserock/morph-2.7",
"build-depends": [
"openssl",
- "readline",
- "zlib"
+ "readline"
]
},
{
@@ -214,8 +207,7 @@
"error-perl-tarball",
"gettext",
"libexpat",
- "openssl",
- "zlib"
+ "openssl"
]
},
{