summaryrefslogtreecommitdiff
path: root/baserock-bootstrap
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-01-06 12:34:50 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-01-06 12:34:50 +0000
commitac8fe4af991b30666f9986903069d35a400fc1e1 (patch)
treecc37ae2c7ca7f80e7c38faf0adc08ecc18b4f45a /baserock-bootstrap
parent3839d8ca2ee7cbdfdfa0960bf9e2527d6fcfa3b5 (diff)
downloadmorph-ac8fe4af991b30666f9986903069d35a400fc1e1.tar.gz
build foundation instead of devel; copy files fully instead of linking
The linking seems to fail if the target already exists. Not worth making a better fix, since this code needs to go away completely.
Diffstat (limited to 'baserock-bootstrap')
-rwxr-xr-xbaserock-bootstrap5
1 files changed, 3 insertions, 2 deletions
diff --git a/baserock-bootstrap b/baserock-bootstrap
index 88ae9b32..6ebb151b 100755
--- a/baserock-bootstrap
+++ b/baserock-bootstrap
@@ -763,11 +763,12 @@ pass2_build_with_morph_in_chroot()
#!/tools/bin/bash
set -e
set -x
+
/tools/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache
cd /baserock/gits/morph
mkdir -p /baserock/cache
python ./morph --verbose build \
- file:///baserock/gits/morphs/ master devel.morph \
+ file:///baserock/gits/morphs/ liw/foo foundation.morph \
--bootstrap \
--cachedir=/baserock/cache \
--log=/baserock/morph.log \
@@ -797,7 +798,7 @@ echo "LFS_TGT=$LFS_TGT"
pass1_directories
-$HOST_CP -alu "$allsources/." "$LFS/sources/."
+$HOST_CP -au "$allsources/." "$LFS/sources/."
download_all
pass1_binutils_1