|
Line
Link Here
|
| 0 |
-- /var/cvsroot/gentoo-x86/scripts/bootstrap.sh |
0 |
++ /var/cvsroot/gentoo-x86/scripts/bootstrap.sh |
|
Lines 262-267
Link Here
|
| 262 |
|
262 |
|
| 263 |
# This stuff should never fail but will if not enough is installed. |
263 |
# This stuff should never fail but will if not enough is installed. |
| 264 |
[[ -z ${myBASELAYOUT} ]] && myBASELAYOUT=">=$(portageq best_version / sys-apps/baselayout)" |
264 |
[[ -z ${myBASELAYOUT} ]] && myBASELAYOUT=">=$(portageq best_version / sys-apps/baselayout)" |
|
|
265 |
[[ -z ${mySHADOW} ]] && mySHADOW=">=$(portageq best_version / sys-apps/shadow)" |
| 265 |
[[ -z ${myPORTAGE} ]] && myPORTAGE="portage" |
266 |
[[ -z ${myPORTAGE} ]] && myPORTAGE="portage" |
| 266 |
[[ -z ${myBINUTILS} ]] && myBINUTILS="binutils" |
267 |
[[ -z ${myBINUTILS} ]] && myBINUTILS="binutils" |
| 267 |
[[ -z ${myGCC} ]] && myGCC="gcc" |
268 |
[[ -z ${myGCC} ]] && myGCC="gcc" |
|
Lines 285-290
Link Here
|
| 285 |
[[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="virtual/os-headers" |
286 |
[[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="virtual/os-headers" |
| 286 |
|
287 |
|
| 287 |
einfo "Using baselayout : ${myBASELAYOUT}" |
288 |
einfo "Using baselayout : ${myBASELAYOUT}" |
|
|
289 |
einfo "Using shadow : ${mySHADOW}" |
| 288 |
einfo "Using portage : ${myPORTAGE}" |
290 |
einfo "Using portage : ${myPORTAGE}" |
| 289 |
einfo "Using os-headers : ${myOS_HEADERS}" |
291 |
einfo "Using os-headers : ${myOS_HEADERS}" |
| 290 |
einfo "Using binutils : ${myBINUTILS}" |
292 |
einfo "Using binutils : ${myBINUTILS}" |
|
Lines 345-351
Link Here
|
| 345 |
: |
347 |
: |
| 346 |
fi |
348 |
fi |
| 347 |
${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} \ |
349 |
${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} \ |
| 348 |
${myGCC} ${myLIBC} ${myBASELAYOUT} ${myZLIB} || cleanup 1 |
350 |
${myGCC} ${myLIBC} ${myBASELAYOUT} ${mySHADOW} ${myZLIB} || cleanup 1 |
| 349 |
echo ------------------------------------------------------------------------------- |
351 |
echo ------------------------------------------------------------------------------- |
| 350 |
set_bootstrap_stage 3 |
352 |
set_bootstrap_stage 3 |
| 351 |
fi |
353 |
fi |
