From f5c85090fb7e69a7c8f148f48aad5f7af9b90c61 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Sat, 29 Dec 2012 14:11:28 -0700 Subject: typo in creating the local.conf file (msalter) Signed-off-by: Al Stone --- stage1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage1 b/stage1 index 62e7a07..beebbde 100755 --- a/stage1 +++ b/stage1 @@ -1094,7 +1094,7 @@ EOF #echo J=-j$newJ #echo DISTCC_HOSTS=$(host $(hostname) | sed 's/.* //'):${DISTCC_PORT}/999 - echo J=1 + echo J=-j1 echo DISTCC_HOSTS=localhost # END BOZO -- cgit From e52f9e3941c5319d6c1effc96137c2ac22b965bc Mon Sep 17 00:00:00 2001 From: Al Stone Date: Sat, 29 Dec 2012 14:27:18 -0700 Subject: make sure /etc/ld.so.conf is correct in the rootfs for stage2 Signed-off-by: Al Stone --- stage1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stage1 b/stage1 index beebbde..6d4717c 100755 --- a/stage1 +++ b/stage1 @@ -1145,6 +1145,12 @@ EOF chmod a+x $ROOTFS/init-rootfs.sh ( cd $ROOTFS; sudo ./init-rootfs.sh ) + # make sure ld.so.conf is set up properly + ( + echo /lib$SUFFIX + echo /usr/lib$SUFFIX + ) > $ROOTFS/etc/ld.so.conf + echo stage2 ready ;; -- cgit From ffc2f8c9526017dba28efac17806ee3032901820 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Sat, 29 Dec 2012 14:28:01 -0700 Subject: correct minor typo Signed-off-by: Al Stone --- stage1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage1 b/stage1 index 6d4717c..da8ccf9 100755 --- a/stage1 +++ b/stage1 @@ -1156,7 +1156,7 @@ EOF ;; stage3 ) - # This assumes stage2 was run and the fies are available + # This assumes stage2 was run and the files are available test -e $ROOTFS/stage3/local.conf && rm $ROOTFS/stage3/local.conf ln -s ../stage2/local.conf $ROOTFS/stage3/local.conf -- cgit