Changeset 9357c13 for common/common-functions
- Timestamp:
- 08/08/2006 05:36:51 PM (18 years ago)
- Branches:
- 1.0
- Children:
- 7d2638a
- Parents:
- 50c8292
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
common/common-functions
r50c8292 r9357c13 242 242 # 243 243 case $script_name in 244 tcl) echo $(grep "^tcl" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;; 245 *) echo $(grep "^$script_name-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;; 244 tcl) echo $(grep "^tcl" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;; 245 linux-headers) echo $(grep "^linux-headers.*.bz2" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;; 246 *) echo $(grep "^$script_name-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;; 246 247 esac 247 248 … … 298 299 @ROOT=\`head -n1 \$(MOUNT_PT)\$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\ 299 300 echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\ 300 chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT 301 EOF 302 ) >> $MKFILE.tmp 303 } 304 305 306 #----------------------------------# 307 wrt_unpack_clfs() { # Unpack and set 'ROOT' var 308 #----------------------------------# 309 local FILE=$1 310 local optSAVE_PREVIOUS=$2 311 312 if [ "${optSAVE_PREVIOUS}" != "1" ]; then 313 wrt_remove_existing_dirs "$FILE" 314 fi 315 ( 316 cat << EOF 317 @\$(call unpack,$FILE) 318 @ROOT=\`head -n1 \$(MOUNT_PT)\$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\ 319 echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\ 320 chown -R clfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT 301 chown -R \$(LUSER) \$(MOUNT_PT)\$(SRC)/\$\$ROOT 321 302 EOF 322 303 ) >> $MKFILE.tmp … … 368 349 cat << EOF 369 350 @echo "export TEST_LOG=$TESTLOGDIR/$TESTLOGFILE" >> envars && \\ 370 su - lfs-c "echo -e '\n\`date\`\n' >$TESTLOGDIR/$TESTLOGFILE"351 su - \$(LUSER) -c "echo -e '\n\`date\`\n' >$TESTLOGDIR/$TESTLOGFILE" 371 352 EOF 372 353 ) >> $MKFILE.tmp … … 399 380 400 381 #----------------------------------# 401 wrt_ run_as_su() { # Execute script inside time { }, footer to log file382 wrt_RunAsUser() { # Execute script inside time { }, footer to log file 402 383 #----------------------------------# 403 384 local this_script=$1 … … 405 386 ( 406 387 cat << EOF 407 @( time { su - lfs -c "source /home/lfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\388 @( time { su - \$(LUSER) -c "source /home/\$(LUSER)/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\ 408 389 echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script 409 390 EOF … … 413 394 414 395 #----------------------------------# 415 wrt_run_as_root() { # Some scripts must be run as root.. 416 #----------------------------------# 396 wrt_RunAsRoot() { # Some scripts must be run as root.. 397 #----------------------------------# 398 local ENV_MOUNT 417 399 local this_script=$1 418 400 local file=$2 419 ( 420 cat << EOF 421 @( time { export LFS=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\ 401 402 case ${PROGNAME} in 403 lfs ) MOUNT_ENV="LFS" ;; 404 blfs ) MOUNT_ENV="BLFS" ;; 405 clfs ) MOUNT_ENV="CLFS" ;; 406 clfs2 ) MOUNT_ENV="CLFS" ;; 407 hlfs ) MOUNT_ENV="HLFS" ;; 408 *) echo "undefined progname $PROGNAME"; exit 1 409 esac 410 411 ( 412 cat << EOF 413 @( time { export ${MOUNT_ENV}=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\ 422 414 echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script 423 415 EOF … … 427 419 428 420 #----------------------------------# 429 wrt_run_as_ clfs_su() { # Execute script inside time { }, footer to log file421 wrt_run_as_root2() { # 430 422 #----------------------------------# 431 423 local this_script=$1 … … 433 425 ( 434 426 cat << EOF 435 @( time { su - clfs -c "source /home/clfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\436 echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script437 EOF438 ) >> $MKFILE.tmp439 }440 441 442 #----------------------------------#443 wrt_run_as_clfs_root() { # Some scripts must be run as root..444 #----------------------------------#445 local this_script=$1446 local file=$2447 (448 cat << EOF449 @( time { export CLFS=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\450 echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script451 EOF452 ) >> $MKFILE.tmp453 }454 455 456 #----------------------------------#457 wrt_run_as_root2() { #458 #----------------------------------#459 local this_script=$1460 local file=$2461 (462 cat << EOF463 427 @( time { source envars && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\ 464 428 echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \`\n" >>logs/$this_script … … 466 430 ) >> $MKFILE.tmp 467 431 } 468 469 432 470 433 … … 527 490 cat << EOF 528 491 @ROOT=\`head -n1 \$(MOUNT_PT)\$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\ 529 rm -r \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\492 rm -rf \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\ 530 493 if [ -e \$(MOUNT_PT)\$(SRC)/$name-build ]; then \\ 531 rm -r \$(MOUNT_PT)\$(SRC)/$name-build; \\494 rm -rf \$(MOUNT_PT)\$(SRC)/$name-build; \\ 532 495 fi; 533 496 EOF … … 543 506 cat << EOF 544 507 @ROOT=\`head -n1 \$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\ 545 rm -r \$(SRC)/\$\$ROOT && \\508 rm -rf \$(SRC)/\$\$ROOT && \\ 546 509 if [ -e \$(SRC)/$name-build ]; then \\ 547 rm -r \$(SRC)/$name-build; \\510 rm -rf \$(SRC)/$name-build; \\ 548 511 fi; 549 512 EOF
Note:
See TracChangeset
for help on using the changeset viewer.