From 769548ec1fed4cdc631f9324cb1c8cb17a94e207 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Wed, 9 May 2012 17:26:41 +0000 Subject: Use the new {x86_64-generic,imx53}-bootstrap-pass3 strata for pass 3. This should fix our "nasm not found when building syslinux" problems. The new strata also bundle all the desired results of pass 3 together for each platform we support bootstrapping on. --- baserock-bootstrap | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'baserock-bootstrap') diff --git a/baserock-bootstrap b/baserock-bootstrap index ff06e584..84992e84 100755 --- a/baserock-bootstrap +++ b/baserock-bootstrap @@ -17,11 +17,11 @@ export LC_ALL=C if (uname -m | grep arm) >/dev/null; then export LFS_TGT=$(uname -m)-lfs-linux-gnueabi export TARGET_CFLAGS="-march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp -O2" - export BSP_STRATUM="imx53-bsp.morph" + export PASS3_STRATUM="imx53-bootstrap-pass3.morph" else export LFS_TGT=$(uname -m)-lfs-linux-gnu export TARGET_CFLAGS="-O2" - export BSP_STRATUM="x86_64-generic-bsp.morph" + export PASS3_STRATUM="x86_64-generic-bootstrap-pass3.morph" fi HOST_CAT=`which cat` @@ -336,9 +336,7 @@ set -x cd /baserock/gits/morph while ! python ./morph --verbose update-gits \ - baserock:morphs master foundation.morph \ - baserock:morphs master devel.morph \ - baserock:morphs master $BSP_STRATUM \ + baserock:morphs master $PASS3_STRATUM \ --cachedir=/baserock/cache \ --log=/baserock/morph.log \ --dump-memory-profile=none \ @@ -385,9 +383,7 @@ set -x export PATH="/usr/bin:/bin:/usr/sbin:/sbin" cd /baserock/gits/morph python ./morph --verbose build \ - baserock:morphs master foundation.morph \ - baserock:morphs master devel.morph \ - baserock:morphs master $BSP_STRATUM \ + baserock:morphs master $PASS3_STRATUM \ --staging-chroot \ --staging-filler "$LFS/baserock/pass2-artifacts/"*.stratum.bootstrap-pass2 \ --no-git-update \ -- cgit v1.2.1