diff options
| author | Al Stone <ahs3@redhat.com> | 2012-12-29 14:28:56 -0700 |
|---|---|---|
| committer | Al Stone <ahs3@redhat.com> | 2012-12-29 14:28:56 -0700 |
| commit | a19d2f9c9e5079ac1aa74b4db1a78c444a5aab79 (patch) | |
| tree | 6737d7055ddb37489a817e7b5870b67cfe16a004 | |
| parent | dc267522929727f49236baabd8b2160083f12623 (diff) | |
| parent | ffc2f8c9526017dba28efac17806ee3032901820 (diff) | |
| download | bootstrap.git.DONOTUSE-a19d2f9c9e5079ac1aa74b4db1a78c444a5aab79.tar.gz bootstrap.git.DONOTUSE-a19d2f9c9e5079ac1aa74b4db1a78c444a5aab79.tar.xz bootstrap.git.DONOTUSE-a19d2f9c9e5079ac1aa74b4db1a78c444a5aab79.zip | |
Merge branch 'aarch64-ahs3'
| -rwxr-xr-x | stage1 | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -1096,7 +1096,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 @@ -1147,12 +1147,18 @@ 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 ;; 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 |