Changeset 621f01f


Ignore:
Timestamp:
09/16/2006 05:45:58 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
experimental
Children:
83c3752
Parents:
80f0ea1
Message:

Fixed create-sbu_du-report target run (I think)

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • CLFS/master.sh

    r80f0ea1 r621f01f  
    10011001  done
    10021002
    1003   # Add SBU-disk_usage report target if required
    1004   if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
    1005 
    10061003}
    10071004
    … …  
    10761073    PREV=$this_script
    10771074  done
    1078 
    1079   # Add SBU-disk_usage report target if required
    1080   if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
    1081 
    10821075
    10831076}
    … …  
    11851178cat << EOF
    11861179
    1187 all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS
     1180all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS create-sbu_du-report
    11881181        @sudo make do-housekeeping
    11891182        @\$(call echo_finished,$VERSION)
    … …  
    12071200        @\$(call echo_PHASE,Cross and Temporary Tools)
    12081201        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make AS_LUSER" )
     1202        @sudo make restore-luser-env
    12091203        @touch \$@
    12101204
    … …  
    12391233CHROOT_JAIL: ${chroottools}${boottools} $testsuitetools $basicsystem  $bootscripttools  $bootabletools
    12401234
     1235do-housekeeping:
     1236        @-umount \$(MOUNT_PT)/dev/pts
     1237        @-umount \$(MOUNT_PT)/dev/shm
     1238        @-umount \$(MOUNT_PT)/dev
     1239        @-umount \$(MOUNT_PT)/sys
     1240        @-umount \$(MOUNT_PT)/proc
     1241        @-rm /tools /cross-tools
     1242        @-if [ ! -f luser-exist ]; then \\
     1243                userdel \$(LUSER); \\
     1244                rm -rf /home/\$(LUSER); \\
     1245        fi;
     1246
    12411247EOF
    12421248) >> $MKFILE
     1249
     1250  # Add SBU-disk_usage report target
     1251  echo "create-sbu_du-report:" >> $MKFILE
     1252  if [[ "$REPORT" = "y" ]] ; then
     1253(
     1254    cat << EOF
     1255        @\$(call echo_message, Building)
     1256        @./create-sbu_du-report.sh logs $VERSION
     1257        @\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
     1258        @touch  \$@
     1259
     1260EOF
     1261) >> $MKFILE
     1262  else echo -e "\t@true\n" >> $MKFILE; fi
     1263
    12431264fi
    12441265
    … …  
    13231344        echo --------------------------------------------------------------------------------\$(WHITE)
    13241345
    1325 do-housekeeping:
    1326         @-umount \$(MOUNT_PT)/dev/pts
    1327         @-umount \$(MOUNT_PT)/dev/shm
    1328         @-umount \$(MOUNT_PT)/dev
    1329         @-umount \$(MOUNT_PT)/sys
    1330         @-umount \$(MOUNT_PT)/proc
    1331         @-rm /tools /cross-tools
    1332         @-if [ ! -f luser-exist ]; then \\
    1333                 userdel \$(LUSER); \\
    1334                 rm -rf /home/\$(LUSER); \\
    1335         fi;
    1336 
    13371346########################################################
    13381347

  • CLFS2/master.sh

    r80f0ea1 r621f01f  
    413413  done
    414414
    415   # Add SBU-disk_usage report target if required
    416   if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
    417 
    418415}
    419416
    … …  
    469466cat << EOF
    470467
    471 all:    ck_UID mk_SETUP mk_LUSER mk_ROOT
     468all:    ck_UID mk_SETUP mk_LUSER mk_ROOT create-sbu_du-report
    472469        @sudo make do-housekeeping
    473470        @\$(call echo_finished,$VERSION)
    … …  
    528525) >> $MKFILE
    529526
     527  # Add SBU-disk_usage report target
     528  echo "create-sbu_du-report:" >> $MKFILE
     529  if [[ "$REPORT" = "y" ]] ; then
     530(
     531    cat << EOF
     532        @\$(call echo_message, Building)
     533        @./create-sbu_du-report.sh logs $VERSION
     534        @\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
     535        @touch  \$@
     536
     537
     538EOF
     539) >> $MKFILE
     540  else echo -e "\t@true\n\n" >> $MKFILE; fi
     541
    530542  # Bring over the items from the Makefile.tmp
    531543  cat $MKFILE.tmp >> $MKFILE

  • HLFS/master.sh

    r80f0ea1 r621f01f  
    559559  cat << EOF
    560560
    561 all:    ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT
     561all:    ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-repor
    562562        @sudo make do-housekeeping
    563563        @\$(call echo_finished,$VERSION)
    … …  
    685685) >> $MKFILE
    686686
     687  # Add SBU-disk_usage report target
     688  echo "create-sbu_du-report:" >> $MKFILE
     689  if [[ "$REPORT" = "y" ]] ; then
     690(
     691    cat << EOF
     692        @\$(call echo_message, Building)
     693        @./create-sbu_du-report.sh logs $VERSION
     694        @\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
     695        @touch  \$@
     696
     697
     698EOF
     699) >> $MKFILE
     700  else echo -e "\t@true\n\n" >> $MKFILE; fi
     701
    687702  # Bring over the items from the Makefile.tmp
    688703  cat $MKFILE.tmp >> $MKFILE

  • LFS/master.sh

    r80f0ea1 r621f01f  
    352352  done  # for file in chapter0{7,8,9}/*
    353353
    354   # Add SBU-disk_usage report target if required
    355   if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
    356354}
    357355
    … …  
    437435    cat << EOF
    438436
    439 all:    ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT
     437all:    ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report
    440438        @sudo make do_housekeeping
    441439        @\$(call echo_finished,$VERSION)
    … …  
    457455        @\$(call echo_SULUSER_request)
    458456        @( sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" )
     457        @sudo make restore-luser-env
    459458        @touch \$@
    460459
    … …  
    478477        @\$(call echo_CHROOT_request)
    479478        @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
    480         @sudo make restore-luser-env
    481479        @touch \$@
    482480
    … …  
    565563        fi;
    566564
    567 
    568 
    569565EOF
    570566) >> $MKFILE
    571567
    572 
     568  # Add SBU-disk_usage report target
     569  echo "create-sbu_du-report:" >> $MKFILE
     570  if [[ "$REPORT" = "y" ]] ; then
     571(
     572    cat << EOF
     573        @\$(call echo_message, Building)
     574        @./create-sbu_du-report.sh logs $VERSION
     575        @\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
     576        @touch  \$@
     577
     578
     579EOF
     580) >> $MKFILE
     581  else echo -e "\t@true\n\n" >> $MKFILE; fi
    573582
    574583  # Bring over the items from the Makefile.tmp
    … …  
    577586  echo "Creating Makefile... ${BOLD}DONE${OFF}"
    578587}
    579 

  • common/common-functions

    r80f0ea1 r621f01f  
    6767    clfs2 ) MOUNT_ENV="CLFS" ;;
    6868    hlfs  ) MOUNT_ENV="HLFS" ;;
    69     *) echo "undefined progname $PROGNAME"; exit 1
     69    *) echo "undefined progname $PROGNAME"; exit 1 ;;
    7070  esac
    7171
    … …  
    7474        @( time { export ${MOUNT_ENV}=\$(MOUNT_PT) && ${PROGNAME}-commands/`dirname $file`/\$@ >>logs/\$@ 2>&1 ; } ) 2>>logs/\$@ && \\
    7575        \$(PRT_DU_CR) >>logs/\$@
    76 EOF
    77 ) >> $MKFILE.tmp
    78 }
    79 
    80 
    81 #----------------------------------#
    82 wrt_report() {                     #
    83 #----------------------------------#
    84 (
    85 cat << EOF
    86 
    87 create-sbu_du-report:  $PREV
    88         @\$(call echo_message, Building)
    89         @./create-sbu_du-report.sh logs $VERSION
    90         @\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
    91         @touch  \$@
    9276EOF
    9377) >> $MKFILE.tmp
    … …  
    344328  if [ "$RUNMAKE" = "y" ] ; then
    345329    # Test to make sure we're running the build as root
    346     if [ "$UID" = "0" ] ; then   
     330    if [ "$UID" = "0" ] ; then
    347331      echo "You must not be logged in as root to build the system."
    348332      exit 1
Note: See TracChangeset for help on using the changeset viewer.