summaryrefslogtreecommitdiff
path: root/baserock-bootstrap
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-03-16 12:54:12 +0000
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-03-16 12:54:12 +0000
commit0d60a83a99c80feb14b6d228f9a8426ef1f4579a (patch)
tree40a6df84457e424d8c0c740ccd5c8fec8cd37c2f /baserock-bootstrap
parent5c52cf732a36232a9d20fc70943aefea3b7c9781 (diff)
downloadmorph-0d60a83a99c80feb14b6d228f9a8426ef1f4579a.tar.gz
Use the bootstrap-pass2.morph stratum for pass 2.
Diffstat (limited to 'baserock-bootstrap')
-rwxr-xr-xbaserock-bootstrap10
1 files changed, 3 insertions, 7 deletions
diff --git a/baserock-bootstrap b/baserock-bootstrap
index ccc96dd4..b1dee355 100755
--- a/baserock-bootstrap
+++ b/baserock-bootstrap
@@ -832,9 +832,7 @@ cd /baserock/gits/morph
mkdir -p /baserock/cache
export PATH="/usr/bin:/bin:$tools/bin:$tools/sbin"
while ! python ./morph --verbose update-gits \
- morphs master foundation.morph \
- morphs master devel-bootstrap.morph \
- morphs master linux-stratum.morph \
+ morphs master bootstrap-pass2.morph \
--bootstrap \
--cachedir=/baserock/cache \
--log=/baserock/morph.log \
@@ -885,9 +883,7 @@ cd /baserock/gits/morph
mkdir -p /baserock/cache
export PATH="/usr/bin:/bin:$tools/bin:$tools/sbin"
python ./morph --verbose build \
- morphs master foundation.morph \
- morphs master devel-bootstrap.morph \
- morphs master linux-stratum.morph \
+ morphs master bootstrap-pass2.morph \
--bootstrap \
--no-git-update \
--cachedir=/baserock/cache \
@@ -947,7 +943,7 @@ pass2_build_devel_system_outside_chroot()
trap "$HOST_SUDO umount $part; $HOST_SUDO kpartx -dv $img" INT TERM EXIT
for stratum in \
- "$LFS"/baserock/cache/*.stratum.{foundation,linux-stratum,devel}
+ "$LFS"/baserock/cache/*.stratum.{bootstrap-pass2}
do
$HOST_SUDO tar -C "$mp" -xhf "$stratum"
done