summaryrefslogtreecommitdiff
path: root/morphlib/builder2.py
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2013-01-28 14:57:39 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2013-03-13 15:20:02 +0000
commitb7f69986034afef8a792839fac601caa0f20d55a (patch)
tree1ff1f9b9b02ee0e68f54ab91dbf6203cc31ebd8c /morphlib/builder2.py
parent79a6f05bbf70a4fa10b1b426ef9f223d5cbaf3ee (diff)
downloadmorph-b7f69986034afef8a792839fac601caa0f20d55a.tar.gz
Remove features used by old bootstrap method
That means that bootstrapping Baserock is currently not possible with this branch of Morph, but there's no reason it cannot be bootstrapped using an older version of Morph instead.
Diffstat (limited to 'morphlib/builder2.py')
-rw-r--r--morphlib/builder2.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index 73745d66..6f7836e3 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -54,6 +54,9 @@ def ldconfig(runcmd, rootdir): # pragma: no cover
'''
+ # FIXME: use the version in ROOTDIR, since even in
+ # bootstrap it will now always exist due to being part of build-essential
+
conf = os.path.join(rootdir, 'etc', 'ld.so.conf')
if os.path.exists(conf):
logging.debug('Running ldconfig for %s' % rootdir)