Changeset 10c8b78


Ignore:
Timestamp:
12/05/2006 03:25:00 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
2512414
Parents:
6bb080e
Message:

More compare and related fixes.
Test build in progress.

Files:
7 edited

Legend:

Unmodified
Added
Removed

  • CLFS/master.sh

    r6bb080e r10c8b78  
    462462          -e 's/mv -v/&f/g' \
    463463          -e 's/mkdir -v/&p/g' -i ${script}
     464      # Rename the scripts
     465      mv ${script} ${script}$N
    464466    done
    465467    # Remove Bzip2 binaries before make install
    466     sed -e 's@make install@rm -vf /usr/bin/bz*\n&@' -i final-system$N/*-bzip2
     468    sed -e 's@make install@rm -vf /usr/bin/bz*\n&@' -i final-system$N/*-bzip2$N
    467469    # Delete *old Readline libraries just after make install
    468     sed -e 's@make install@&\nrm -v /lib/lib{history,readline}*old@' -i final-system$N/*-readline
     470    sed -e 's@make install@&\nrm -v /lib/lib{history,readline}*old@' -i final-system$N/*-readline$N
    469471  fi
    470472
    … …  
    492494                                  -e 's@-64@@' \
    493495                                  -e 's@64@@' \
    494                                   -e 's@n32@@'`
     496                                  -e 's@n32@@' \
     497                                  -e 's,'$N',,'`
    495498
    496499    # Find the version of the command files, if it corresponds with the building of
    … …  
    508511    # Append each name of the script files to a list (this will become
    509512    # the names of the targets in the Makefile
    510     basicsystem="$basicsystem ${this_script}${N}"
     513    basicsystem="$basicsystem ${this_script}"
    511514
    512515    #--------------------------------------------------------------------#
    … …  
    516519    # Drop in the name of the target on a new line, and the previous target
    517520    # as a dependency. Also call the echo_message function.
    518     CHROOT_wrt_target "${this_script}${N}" "$PREV"
     521    CHROOT_wrt_target "${this_script}" "$PREV"
    519522
    520523    # If $pkg_tarball isn't empty, we've got a package...
    … …  
    524527      case $name in
    525528        binutils | gcc | glibc )
    526           [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}${N}"
     529          [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}"
    527530          ;;
    528531        * )
    529           [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && CHROOT_wrt_test_log "${this_script}${N}"
     532          [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && CHROOT_wrt_test_log "${this_script}"
    530533          ;;
    531534      esac
    … …  
    546549    #
    547550    # Keep the script file name for Makefile dependencies.
    548     PREV=${this_script}${N}
     551    PREV=${this_script}
    549552    # Set system_build envar for iteration targets
    550553    system_build=$basicsystem

  • HLFS/master.sh

    r6bb080e r10c8b78  
    2020  local remove_existing
    2121
    22   tc_phase=`echo $toolchain | sed -e 's@[0-9]\{3\}-@@' -e 's@-toolchain@@'`
     22  tc_phase=`echo $toolchain | sed -e 's@[0-9]\{3\}-@@' -e 's@-toolchain@@' -e 's,'$N',,'`
    2323  case $tc_phase in
    2424    embryo | \
    … …  
    269269      # Overwrite existing symlinks, files, and dirs
    270270      sed -e 's/ln -s /ln -sf /g' \
    271           -e 's/^mv /&-f/g' -i ${script}
     271          -e 's/^mv /&-f /g' \
     272          -e 's/mkdir -v/&p/g' -i ${script}
     273      # Rename the scripts
     274      mv ${script} ${script}$N
    272275    done
    273276    # Remove Bzip2 binaries before make install
    274     sed -e 's@make install@rm -vf /usr/bin/bz*\n&@' -i chapter06$N/*-bzip2
     277    sed -e 's@make install@rm -vf /usr/bin/bz*\n&@' -i chapter06$N/*-bzip2$N
    275278    # Fix how Module-Init-Tools do the install target
    276     sed -e 's@make install@make INSTALL=install install@' -i chapter06$N/*-module-init-tools
    277     # Delete *old Readline libraries just after make install
    278     sed -e 's@make install@&\nrm -v /lib/lib{history,readline}*old@' -i chapter06$N/*-readline
     279    sed -e 's@make install@make INSTALL=install install@' -i chapter06$N/*-module-init-tools$N
    279280    # Don't readd already existing groups
    280     sed -e '/groupadd/d' -i chapter06$N/*-udev
     281    sed -e '/groupadd/d' -i chapter06$N/*-udev$N
    281282  fi
    282283
    … …  
    297298
    298299    # Grab the name of the target
    299     name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
     300    name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@' -e 's,'$N',,'`
    300301
    301302    case $name in
    … …  
    316317    # Append each name of the script files to a list (this will become
    317318    # the names of the targets in the Makefile
    318     chapter6="$chapter6 ${this_script}${N}"
     319    chapter6="$chapter6 ${this_script}"
    319320
    320321
    … …  
    326327    # as a dependency. Also call the echo_message function.
    327328    if [[ ${name} = "butterfly-toolchain" ]]; then
    328        CHROOT_wrt_target "${this_script}${N}" "$PREV"
     329       CHROOT_wrt_target "${this_script}" "$PREV"
    329330         process_toolchain "${this_script}" "${file}"
    330331       wrt_touch
    … …  
    333334    fi
    334335
    335     CHROOT_wrt_target "${this_script}${N}" "$PREV"
     336    CHROOT_wrt_target "${this_script}" "$PREV"
    336337
    337338    # If $pkg_tarball isn't empty, we've got a package...
    … …  
    342343      # butterfly-toolchain tests are enabled in 'process_tookchain' function
    343344      case $name in
    344         glibc ) [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}${N}"
     345        glibc ) [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}"
    345346          ;;
    346             * ) [[ "$TEST" > "1" ]]  && CHROOT_wrt_test_log "${this_script}${N}"
     347            * ) [[ "$TEST" > "1" ]]  && CHROOT_wrt_test_log "${this_script}"
    347348          ;;
    348349      esac
    … …  
    374375
    375376    # Keep the script file name for Makefile dependencies.
    376     PREV=${this_script}${N}
     377    PREV=${this_script}
    377378    # Set system_build envar for iteration targets
    378379    system_build=$chapter6

  • LFS/master.sh

    r6bb080e r10c8b78  
    178178          -e 's/mv -v/&f/g' \
    179179          -e 's/mkdir -v/&p/g' -i ${script}
     180      # Rename the scripts
     181      mv ${script} ${script}$N
    180182    done
    181183    # Remove Bzip2 binaries before make install
    182     sed -e 's@make install@rm -vf /usr/bin/bz*\n&@' -i chapter06$N/*-bzip2
     184    sed -e 's@make install@rm -vf /usr/bin/bz*\n&@' -i chapter06$N/*-bzip2$N
    183185  fi
    184186
    … …  
    197199
    198200    # Grab the name of the target.
    199     name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'`
     201    name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@' -e 's,'$N',,'`
    200202
    201203    # Find the version of the command files, if it corresponds with the building of
    … …  
    216218    case "${this_script}" in
    217219      *kernfs) runasroot="$runasroot ${this_script}" ;;
    218             *) chapter6="$chapter6 ${this_script}${N}" ;;
     220            *) chapter6="$chapter6 ${this_script}" ;;
    219221    esac
    220222
    … …  
    229231    case "${this_script}" in
    230232      *kernfs)  LUSER_wrt_target  "${this_script}" "$PREV" ;;
    231       *)        CHROOT_wrt_target "${this_script}${N}" "$PREV" ;;
     233      *)        CHROOT_wrt_target "${this_script}" "$PREV" ;;
    232234    esac
    233235
    … …  
    239241      case $name in
    240242        binutils | gcc | glibc )
    241           [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}${N}"
     243          [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}"
    242244          ;;
    243245        * )
    244           [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && CHROOT_wrt_test_log "${this_script}${N}"
     246          [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && CHROOT_wrt_test_log "${this_script}"
    245247          ;;
    246248      esac
    … …  
    270272
    271273    # Keep the script file name for Makefile dependencies.
    272     PREV=${this_script}${N}
     274    PREV=${this_script}
    273275    # Set system_build envar for iteration targets
    274276    system_build=$chapter6

  • common/common-functions

    r6bb080e r10c8b78  
    5656      # Clean the build directory
    5757      echo -n "Cleaning $BUILDDIR ..."
    58       sudo rm -rf $BUILDDIR/{bin,boot,dev,etc,home,lib,media,mnt,opt,proc,root,sbin,srv,sys,tmp,tools,cross-tools,usr,var}
     58      sudo rm -rf $BUILDDIR/{bin,boot,etc,home,lib,media,mnt,opt,root,sbin,srv,tmp,tools,cross-tools,usr,var}
    5959      echo "done"
    6060      echo -n "Cleaning $JHALFSDIR ..."

  • common/create-sbu_du-report.sh

    r6bb080e r10c8b78  
    2020# If there is iteration logs directories, copy the logs inside iteration-1
    2121# to the top level dir
    22 [[ -d "$LOGSDIR"/iteration-1 ]] && \
    23   cp $LOGSDIR/iteration-1/* $LOGSDIR
     22[[ -d "$LOGSDIR"/build_1 ]] && \
     23  cp $LOGSDIR/build_1/* $LOGSDIR
    2424
    2525# Set the report file

  • common/libs/func_compare.sh

    r6bb080e r10c8b78  
    1414    CHROOT_wrt_target "$ITERATION" "$PREV"
    1515    wrt_compare_work "$ITERATION" "$PREV_IT"
     16    wrt_logs "$N"
    1617    wrt_touch
    1718    PREV_IT=$ITERATION
    … …  
    4748    fi
    4849  fi
    49 
    50   echo -e "\nsystem_build_$RUN: $PREV_IT $system_build" >> $MKFILE.tmp
    5150}
    5251
    … …  
    107106  echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE >>logs/\$@ 2>&1" >> $MKFILE.tmp
    108107}
     108
     109#----------------------------------#
     110wrt_logs() {                       #
     111#----------------------------------#
     112  local build=build_$1
     113  local file
     114
     115(
     116    cat << EOF
     117        @cd logs && \\
     118        mkdir $build && \\
     119        mv -f ${system_build} $build && \\
     120        if [ ! $build = build_1 ] ; then \\
     121          cd $build && \\
     122          for file in \`ls .\` ; do \\
     123            mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\
     124          done ; \\
     125        fi ;
     126        @cd /\$(SCRIPT_ROOT)
     127        @if [ -d test-logs ] ; then \\
     128          cd test-logs && \\
     129          mkdir $build && \\
     130          mv -f ${system_build} $build && \\
     131          if [ ! $build = build_1 ] ; then \\
     132            cd $build && \\
     133            for file in \`ls .\` ; do \\
     134              mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\
     135            done ; \\
     136          fi ; \\
     137          cd /\$(SCRIPT_ROOT) ; \\
     138        fi ;
     139EOF
     140) >> $MKFILE.tmp
     141}

  • common/libs/func_wrt_Makefile

    r6bb080e r10c8b78  
    187187cat  << EOF
    188188        @echo "export  TEST_LOG=\$(TESTLOGDIR)/$TESTLOGFILE" >> envars && \\
    189         echo '\$(nl_)\`date\`\$(nl_)' >\$(TESTLOGDIR)/\$@
     189        echo "\$(nl_)\`date\`\$(nl_)" >\$(TESTLOGDIR)/\$@
    190190EOF
    191191) >> $MKFILE.tmp
Note: See TracChangeset for help on using the changeset viewer.