Changeset 460ea63


Ignore:
Timestamp:
06/02/2006 05:53:17 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
experimental
Children:
4761b5a
Parents:
db6b934
Message:

Merged r2734:2745 from trunk.

Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

  • CLFS/master.sh

    rdb6b934 r460ea63  
    992992SRC= /sources
    993993MOUNT_PT= $BUILDDIR
     994PKG_LST= $PKG_LST
    994995
    995996include makefile-functions

  • HLFS/master.sh

    rdb6b934 r460ea63  
    142142      esac
    143143      # Insert instructions for unpacking the package and to set the PKGDIR variable.
    144       wrt_unpack "$FILE"
     144      case $this_script in
     145        *binutils* )
     146          wrt_unpack "$FILE" 1 ;; # Do not delete an existing package directories
     147        *)
     148          wrt_unpack "$FILE" ;;
     149      esac
    145150      [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
    146151    fi
    … …  
    150155(
    151156cat << EOF
    152         @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
     157        @ROOT=\`head -n1 \$(MOUNT_PT)\$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\
    153158        echo "\$(MOUNT_PT)\$(SRC)/\$\$ROOT" >> sources-dir
    154159EOF
    … …  
    430435(
    431436cat << EOF
    432         @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
     437        @ROOT=\`head -n1 \$(MOUNT_PT)\$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\
    433438        rm -r \$(MOUNT_PT)\$(SRC)/\$\$ROOT
    434439        @rm -r \`cat sources-dir\` && \\
    … …  
    479484SRC= /sources
    480485MOUNT_PT= $BUILDDIR
     486PKG_LST= $PKG_LST
    481487
    482488include makefile-functions
    … …  
    572578                rm -rf /home/lfs; \\
    573579        fi;
    574        
     580
    575581EOF
    576582) >> $MKFILE

  • LFS/master.sh

    rdb6b934 r460ea63  
    356356SRC= /sources
    357357MOUNT_PT= $BUILDDIR
     358PKG_LST= $PKG_LST
    358359
    359360include makefile-functions
    … …  
    432433        @chown lfs:lfs /home/lfs/.bash* && \\
    433434        touch \$@
    434        
     435
    435436do_housekeeping:
    436437        -umount \$(MOUNT_PT)/sys
    … …  
    443444                rm -rf /home/lfs; \\
    444445        fi;
    445        
     446
    446447EOF
    447448) >> $MKFILE

  • common/common-functions

    rdb6b934 r460ea63  
    5858${BOLD}  -D  --directory DIR${OFF}
    5959        use DIR directory for building ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF}; all files jhalfs-X produces
    60         will be in the directory DIR/jhalfs.
     60        will be in the directory DIR/${SCRIPT_ROOT}.
    6161        The current setting for BUILDDIR is "$BUILDDIR"
    6262
    … …  
    202202$i:  $PREV
    203203        @\$(call echo_message, Building)
    204         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >logs/$LOGFILE
    205 EOF
    206 ) >> $MKFILE.tmp
    207 }
     204        @./progress_bar.sh \$@ &
     205        @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >logs/$LOGFILE
     206EOF
     207) >> $MKFILE.tmp
     208}
     209
     210
     211#----------------------------------#
     212wrt_remove_existing_dirs() {       #
     213#----------------------------------#
     214  local PKG_NAME=$1
     215(
     216cat << EOF
     217        @PKG_PATH=\`ls -t \$(MOUNT_PT)\$(SRC)/${PKG_NAME} | head -n1\` && \\
     218        ROOT=\`tar -tf \$\$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'\` && \\
     219        [[ -n \$\$ROOT ]] && \\
     220        rm -rf \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\
     221        if [ -e \$(MOUNT_PT)\$(SRC)/${PKG_NAME%%-*}-build ]; then \\
     222                rm -rf \$(MOUNT_PT)\$(SRC)/${PKG_NAME%%-*}-build; \\
     223        fi;
     224EOF
     225) >> $MKFILE.tmp
     226}
     227
     228#----------------------------------#
     229wrt_remove_existing_dirs2() {      #
     230#----------------------------------#
     231  local PKG_NAME=$1
     232(
     233cat << EOF
     234        @PKG_PATH=\`ls -t \$(SRC)/${PKG_NAME} | head -n1\` && \\
     235        ROOT=\`tar -tf \$\$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'\` && \\
     236        [[ -n \$\$ROOT ]] && \\
     237        rm -rf \$(SRC)/\$\$ROOT && \\
     238        if [ -e \$(SRC)/${PKG_NAME%%-*}-build ]; then \\
     239                rm -rf \$(SRC)/${PKG_NAME%%-*}-build; \\
     240        fi;
     241EOF
     242) >> $MKFILE.tmp
     243}
     244
    208245
    209246
    … …  
    212249#----------------------------------#
    213250  local FILE=$1
     251  local optSAVE_PREVIOUS=$2
     252
     253  if [ "${optSAVE_PREVIOUS}" != "1" ]; then
     254    wrt_remove_existing_dirs "$FILE"
     255  fi
    214256(
    215257cat << EOF
    216258        @\$(call unpack,$FILE)
    217         @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
     259        @ROOT=\`head -n1 \$(MOUNT_PT)\$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\
    218260        echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\
    219261        chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT
    … …  
    227269#----------------------------------#
    228270  local FILE=$1
     271  local optSAVE_PREVIOUS=$2
     272
     273  if [ "${optSAVE_PREVIOUS}" != "1" ]; then
     274    wrt_remove_existing_dirs "$FILE"
     275  fi
    229276(
    230277cat  << EOF
    231278        @\$(call unpack2,$FILE)
    232         @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
     279        @ROOT=\`head -n1 \$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\
    233280        echo "export PKGDIR=\$(SRC)/\$\$ROOT" > envars
    234281EOF
    … …  
    241288#----------------------------------#
    242289  local FILE=$1
     290  local optSAVE_PREVIOUS=$2
     291
     292  if [ "${optSAVE_PREVIOUS}" != "1" ]; then
     293    wrt_remove_existing_dirs2 "$FILE"
     294  fi
    243295(
    244296cat  << EOF
    245297        @\$(call unpack3,$FILE)
    246         @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
     298        @ROOT=\`head -n1 \$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\
    247299        echo "export PKGDIR=\$(SRC)/\$\$ROOT" > envars
    248300EOF
    249301) >> $MKFILE.tmp
    250302}
    251 
    252303
    253304#----------------------------------#
    … …  
    272323cat << EOF
    273324        @( time { su - lfs -c "source /home/lfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
    274         echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/$this_script
     325        echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script
    275326EOF
    276327) >> $MKFILE.tmp
    … …  
    286337cat << EOF
    287338        @( time { export LFS=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
    288         echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/$this_script
     339        echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script
    289340EOF
    290341) >> $MKFILE.tmp
    … …  
    300351cat << EOF
    301352        @( time { source envars && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
    302         echo -e "\nKB: \`du -skx --exclude=jhalfs \`\n" >>logs/$this_script
     353        echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \`\n" >>logs/$this_script
    303354EOF
    304355) >> $MKFILE.tmp
    … …  
    314365(
    315366    cat << EOF
    316         @( time { \$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
    317         echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/${this_script}
     367        @( time { \$(CHROOT1) 'cd /${SCRIPT_ROOT} && source envars && /${SCRIPT_ROOT}/${PROGNAME}-commands/$file >>/${SCRIPT_ROOT}/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
     368        echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/${this_script}
    318369EOF
    319370) >> $MKFILE.tmp
    … …  
    328379(
    329380cat << EOF
    330         @( time { \$(CHROOT2) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
    331         echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/${this_script}
     381        @( time { \$(CHROOT2) 'cd /${SCRIPT_ROOT} && source envars && /${SCRIPT_ROOT}/${PROGNAME}-commands/$file >>/${SCRIPT_ROOT}/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
     382        echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/${this_script}
    332383EOF
    333384) >> $MKFILE.tmp
    … …  
    364415(
    365416cat << EOF
    366         @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
     417        @ROOT=\`head -n1 \$(MOUNT_PT)\$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\
    367418        rm -r \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\
    368419        if [ -e \$(MOUNT_PT)\$(SRC)/$name-build ]; then \\
    … …  
    380431(
    381432cat << EOF
    382         @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
     433        @ROOT=\`head -n1 \$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\
    383434        rm -r \$(SRC)/\$\$ROOT && \\
    384435        if [ -e \$(SRC)/$name-build ]; then \\

  • common/config

    rdb6b934 r460ea63  
    8989
    9090#--- Working directories
    91 JHALFSDIR=$BUILDDIR/jhalfs
     91SCRIPT_ROOT=jhalfs
     92JHALFSDIR=$BUILDDIR/$SCRIPT_ROOT
    9293   LOGDIR=$JHALFSDIR/logs
     94
     95#--- File listing package contents (from where package sources dir is extracted)
     96PKG_LST=unpacked
    9397
    9498#--- ICA report log directory

  • common/func_compare.sh

    rdb6b934 r460ea63  
    4444  local ITERATION=$1
    4545  local   PREV_IT=$2
    46   local PRUNEPATH="/dev /home /jhalfs /lost+found /media /mnt /opt /proc \
     46  local PRUNEPATH="/dev /home /${SCRIPT_ROOT} /lost+found /media /mnt /opt /proc \
    4747/sources /root /srv /sys /tmp /tools /usr/local /usr/src /var/log/paco"
    4848
    4949  if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then
    5050    local    ROOT_DIR=/
    51     local DEST_TOPDIR=/jhalfs
    52     local   ICALOGDIR=/jhalfs/logs/ICA
    53     local FARCELOGDIR=/jhalfs/logs/farce
     51    local DEST_TOPDIR=/${SCRIPT_ROOT}
     52    local   ICALOGDIR=/${SCRIPT_ROOT}/logs/ICA
     53    local FARCELOGDIR=/${SCRIPT_ROOT}/logs/farce
    5454  else
    5555    local    ROOT_DIR=$BUILDDIR
    56     local DEST_TOPDIR=$BUILDDIR/jhalfs
     56    local DEST_TOPDIR=$BUILDDIR/${SCRIPT_ROOT}
    5757  fi
    5858

  • common/makefile-functions

    rdb6b934 r460ea63  
    1818define unpack
    1919  @cd $(MOUNT_PT)$(SRC) && \
    20   tar -xvf `ls -t $(1) | head -n1` > /tmp/unpacked
     20  tar -xvf `ls -t $(1) | head -n1` > $(PKG_LST)
    2121endef
    2222
    2323define unpack2
    2424  @cd $(MOUNT_PT)$(SRC) && \
    25   /tools/bin/tar -xvf `ls -t $(1) | head -n1` > /tmp/unpacked
     25  /tools/bin/tar -xvf `ls -t $(1) | head -n1` > $(PKG_LST)
    2626endef
    2727
    2828define unpack3
    2929  @cd $(SRC) && \
    30   tar -xvf `ls -t $(1) | head -n1` > /tmp/unpacked
     30  tar -xvf `ls -t $(1) | head -n1` > $(PKG_LST)
    3131endef
    3232

  • master.sh

    rdb6b934 r460ea63  
    137137        * )
    138138          BUILDDIR=$1
    139           JHALFSDIR=$BUILDDIR/jhalfs
     139          JHALFSDIR=$BUILDDIR/${SCRIPT_ROOT}
    140140          LOGDIR=$JHALFSDIR/logs
    141141          MKFILE=$JHALFSDIR/Makefile
    … …  
    482482#
    483483if [[ "$PWD" != "$JHALFSDIR" ]]; then
    484   cp $COMMON_DIR/makefile-functions $JHALFSDIR/
     484  cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/
    485485  [[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/
    486486  if [[ "$COMPARE" != "0" ]] ; then
Note: See TracChangeset for help on using the changeset viewer.