- Timestamp:
- 07/28/2006 03:55:40 AM (18 years ago)
- Branches:
- experimental
- Children:
- a82bbc0
- Parents:
- 65a2be6
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
HLFS/master.sh
r65a2be6 r21dab83 44 44 } 45 45 46 #----------------------------------# 47 wrt_RunAsRoot() { # Some scripts must be run as root.. 48 #----------------------------------# 49 local user_ACCT=$(echo $1 | tr [a-z] [A-Z]) 50 local this_script=$2 51 local file=$3 52 53 ( 54 cat << EOF 55 @( time { export ${user_ACCT}=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\ 56 echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script 57 EOF 58 ) >> $MKFILE.tmp 59 } 60 61 46 62 #----------------------------# 47 63 process_toolchain() { # embryo,cocoon and butterfly need special handling … … 59 75 pkg_tarball=$(get_package_tarball_name "gcc-g++") 60 76 wrt_Unpack_SetOwner "hlfs" "$pkg_tarball" 1 77 78 case ${toolchain} in 79 *butterfly*) 80 [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}" 81 ( 82 cat << EOF 83 @echo "export PKGDIR=\$(SRC)" > envars 84 EOF 85 ) >> $MKFILE.tmp 86 wrt_run_as_chroot1 "$toolchain" "$this_script" 87 ;; 88 *) 61 89 ( 62 90 cat << EOF … … 64 92 EOF 65 93 ) >> $MKFILE.tmp 66 if [[ ${toolchain} = "butterfly-toolchain" ]]; then 67 [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}" 68 wrt_run_as_chroot1 "$toolchain" "$this_script" 69 else 70 wrt_ExecuteAsUser "hlfs" "$toolchain" "$this_script" 71 fi 94 wrt_ExecuteAsUser "hlfs" "$toolchain" "$this_script" 95 ;; 96 esac 72 97 73 98 pkg_tarball=$(get_package_tarball_name "binutils") … … 75 100 pkg_tarball=$(get_package_tarball_name "gcc-core") 76 101 wrt_remove_existing_dirs "$pkg_tarball" 77 102 # 78 103 # Manually remove the toolchain directories.. 79 104 tc_phase=`echo $toolchain | sed -e 's@[0-9]\{3\}-@@' -e 's@-toolchain@@'` 80 case $tc_phase in81 embryo | cocoon) # toolchain phase82 105 ( 83 106 cat << EOF … … 86 109 EOF 87 110 ) >> $MKFILE.tmp 88 ;;89 butterfly ) # system phase90 (91 cat << EOF92 @rm -r \$(SRC)/butterfly-toolchain && \\93 rm -r \$(SRC)/butterfly-build94 EOF95 ) >> $MKFILE.tmp96 ;;97 esac98 111 99 112 } … … 377 390 case "${this_script}" in 378 391 *kernfs*) 379 wrt_ run_as_root"${this_script}" "${file}"392 wrt_RunAsRoot "hlfs" "${this_script}" "${file}" 380 393 ;; 381 394 *) # The rest of Chapter06 … … 422 435 *usage) continue ;; # Contains example commands 423 436 *grub) continue ;; 424 *reboot) continue ;;425 437 *console) continue ;; # Use the file generated by lfs-bootscripts 426 438
Note:
See TracChangeset
for help on using the changeset viewer.