Changeset 5a4f6a7 for common/libs


Ignore:
Timestamp:
09/25/2007 07:12:36 PM (17 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
experimental
Children:
f5f857d
Parents:
f11a672
Message:

Revising func_wrt_Makefile

File:
1 edited

Legend:

Unmodified
Added
Removed

  • common/libs/func_wrt_Makefile

    rf11a672 r5a4f6a7  
    3939SU_LUSER       = su - \$(LUSER) -c
    4040LUSER_HOME     = \$(LHOME)/\$(LUSER)
    41 PRT_DU         = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found \$(MOUNT_PT) \`\n"
    42 PRT_DU_CR      = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found / \`\n"
    4341
    4442ADD_REPORT       = $REPORT
    … …  
    5856
    5957
    60 #==== PACKAGES NAMES ===
    61 
    62 #----------------------------------#
    63 get_package_tarball_name() {       #
    64 #----------------------------------#
    65   local script_name=`echo ${1} | sed -e 's@[0-9]\{1\}-@@'`
    66 
    67    # The use of 'head' is necessary to limit the return value to the FIRST match..
    68    # hopefully this will not cause problems.
    69    #
    70    case $script_name in
    71      tcl) echo $(grep "^tcl" $JHALFSDIR/pkg_tarball_list | head -n1 )
    72          ;;
    73      powerpc-utils) echo $(grep "^powerpc-utils" $JHALFSDIR/pkg_tarball_list | head -n1 )
    74          ;;
    75      uClibc)
    76          if [[ "${PROGNAME}" = "clfs3" ]]; then
    77            echo $(grep "^uClibc-" $JHALFSDIR/pkg_tarball_list | head -n1 )
    78          else
    79            echo $(grep "^$script_name-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
    80          fi
    81          ;;
    82      linux-headers)
    83          if [[ "${PROGNAME}" = "lfs" ]] || [[ "${PROGNAME}" = "hlfs" ]] ; then
    84            # Uses kernel headers directly
    85            echo $(grep "^linux-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
    86          else
    87            # CLFS{,2,3} use massaged headers package
    88            echo $(grep "^linux-headers-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
    89          fi
    90          ;;
    91      *)  echo $(grep "^$script_name-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
    92          ;;
    93    esac
    94 
    95 }
    96 
    97 #=======================
    98 
    99 
    10058#==== TARGET HEADER ====
    10159
    10260#----------------------------------#
    103 LUSER_wrt_target() {               # Create target and initialize log file
     61LUSER_wrt_target() {               # Create target and initialize envars file
    10462#----------------------------------#
    10563  local i=$1
    … …  
    11169        @\$(call echo_message, Building)
    11270        @export BASHBIN=\$(SHELL) && \$(SHELL) progress_bar.sh \$@ \$\$PPID &
    113         @echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@
    114         @\$(PRT_DU) >>logs/\$@
    115 EOF
    116 ) >> $MKFILE.tmp
    117 }
    118 
    119 #----------------------------------#
    120 CHROOT_wrt_target() {              # Create target and initialize log file
     71        @rm -f envars && touch envars
     72EOF
     73) >> $MKFILE.tmp
     74}
     75
     76#----------------------------------#
     77CHROOT_wrt_target() {              #
    12178#----------------------------------#
    12279  local i=$1
    … …  
    12885        @\$(call echo_message, Building)
    12986        @export BASHBIN=\$(SHELL) && \$(SHELL) progress_bar.sh \$@ \$\$PPID &
    130         @echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@
    131         @\$(PRT_DU_CR) >>logs/\$@
    132 EOF
    133 ) >> $MKFILE.tmp
    134 }
    135 
    136 #=======================
    137 
    138 
    139 #======== UNPACK =======
    140 
    141 #----------------------------------#
    142 LUSER_wrt_unpack() {               # Unpack and set 'ROOT' var
    143 #----------------------------------#
    144   local FILE=$1
    145   local optSAVE_PREVIOUS=$2
    146 
    147   if [[ "${optSAVE_PREVIOUS}" != "1" ]]; then
    148 (
    149 cat << EOF
    150         @\$(call remove_existing_dirs,$FILE)
    151 EOF
    152 ) >> $MKFILE.tmp
    153   fi
    154 
    155 (
    156 cat << EOF
    157         @\$(call unpack,$FILE)
    158         @\$(call get_pkg_root_LUSER)
    159 EOF
    160 ) >> $MKFILE.tmp
    161 }
    162 
    163 #----------------------------------#
    164 CHROOT_Unpack() {                  #
    165 #----------------------------------#
    166   local FILE=$1
    167   local optSAVE_PREVIOUS=$2
    168 
    169   if [ "${optSAVE_PREVIOUS}" != "1" ]; then
    170 (
    171 cat << EOF
    172         @\$(call remove_existing_dirs2,$FILE)
    173 EOF
    174 ) >> $MKFILE.tmp
    175   fi
    176 (
    177 cat  << EOF
    178         @\$(call unpack2,$FILE)
    179         @\$(call get_pkg_root2)
     87        @rm -f envars && touch envars
    18088EOF
    18189) >> $MKFILE.tmp
    … …  
    194102cat  << EOF
    195103        @echo "export  TEST_LOG=\$(TESTLOGDIR)/$TESTLOGFILE" >> envars && \\
    196         echo "\$(nl_)\`date\`\$(nl_)" >\$(TESTLOGDIR)/\$@
     104        echo "\$(nl_)\`date\`\$(nl_)" > \$(TESTLOGDIR)/\$@
    197105EOF
    198106) >> $MKFILE.tmp
    … …  
    206114cat  << EOF
    207115        @echo "export TEST_LOG=\$(crTESTLOGDIR)/$TESTLOGFILE" >> envars && \\
    208         echo "\$(nl_)\`date\`\$(nl_)" >test-logs/\$@
     116        echo "\$(nl_)\`date\`\$(nl_)" > test-logs/\$@
    209117EOF
    210118) >> $MKFILE.tmp
    … …  
    233141(
    234142cat << EOF
    235         @export ${MOUNT_ENV}=\$(MOUNT_PT) && \\
    236         ${PROGNAME}-commands/`dirname $file`/\$@ >>logs/\$@ 2>&1 && \\
    237         \$(PRT_DU) >>logs/\$@
    238 EOF
    239 ) >> $MKFILE.tmp
    240 }
    241 
    242 #----------------------------------#
    243 LUSER_wrt_RunAsUser() {            # Calculate time with perl, footer to log file
     143        @export ${MOUNT_ENV}=\$(MOUNT_PT) && ${PROGNAME}-commands/`dirname $file`/\$@ > logs/\$@ 2>&1
     144EOF
     145) >> $MKFILE.tmp
     146}
     147
     148#----------------------------------#
     149LUSER_wrt_RunAsUser() {            #
    244150#----------------------------------#
    245151  local file=$1
    … …  
    247153(
    248154cat << EOF
    249         @source ~/.bashrc && \\
    250         \$(CMDSDIR)/`dirname $file`/\$@ >> logs/\$@ 2>&1 && \\
    251         \$(PRT_DU) >>logs/\$@
     155        @source ~/.bashrc && \$(CMDSDIR)/`dirname $file`/\$@ > logs/\$@ 2>&1
    252156EOF
    253157) >> $MKFILE.tmp
    … …  
    260164(
    261165cat << EOF
    262         @source envars && \\
    263         \$(crCMDSDIR)/`dirname $file`/\$@ >>logs/\$@ 2>&1 && \\
    264         \$(PRT_DU_CR) >>logs/\$@
     166        @source envars && \$(crCMDSDIR)/`dirname $file`/\$@ > logs/\$@ 2>&1
    265167EOF
    266168) >> $MKFILE.tmp
    … …  
    278180(
    279181cat << EOF
    280         @cp -v \$(MOUNT_PT)/sources/fstab \$(MOUNT_PT)/etc/fstab >>logs/\$@ 2>&1 && \\
    281         \$(PRT_DU) >>logs/\$@
     182        @cp -v \$(MOUNT_PT)/sources/fstab \$(MOUNT_PT)/etc/fstab > logs/\$@ 2>&1
    282183EOF
    283184) >> $MKFILE.tmp
    … …  
    289190(
    290191cat << EOF
    291         @cp -v /sources/fstab /etc/fstab >>logs/\$@ 2>&1 && \\
    292         \$(PRT_DU_CR) >>logs/\$@
     192        @cp -v /sources/fstab /etc/fstab > logs/\$@ 2>&1
    293193EOF
    294194) >> $MKFILE.tmp
    … …  
    345245
    346246
    347 #==== RM BUILD DIRS ====
    348 
    349 #----------------------------------#
    350 LUSER_RemoveBuildDirs() {          #
    351 #----------------------------------#
    352   local name=$1
    353 (
    354 cat << EOF
    355         @\$(call remove_build_dirs,$name)
    356 EOF
    357 ) >> $MKFILE.tmp
    358 }
    359 
    360 #----------------------------------#
    361 CHROOT_wrt_RemoveBuildDirs() {     #
    362 #----------------------------------#
    363   local name=$1
    364 (
    365 cat << EOF
    366         @\$(call remove_build_dirs2,$name)
    367 EOF
    368 ) >> $MKFILE.tmp
    369 }
    370 
    371 #=======================
    372 
    373 
    374247#======== TOUCH ========
    375248
Note: See TracChangeset for help on using the changeset viewer.