Changeset 401f81e for CLFS


Ignore:
Timestamp:
08/16/2006 05:42:54 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:
fdb330a
Parents:
5be3651
Message:

Ported Makefile clean-up and 0/1 to n/y migration code from experimental.
There is no obvious bugs, let users to find hidden bugs.

Location:
CLFS
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • CLFS/clfs.xsl

    r5be3651 r401f81e  
    2929
    3030  <!-- Bomb on test suites failures?
    31        0 = no, I want to build the full system and review the logs
    32        1 = yes, bomb at the first test suite failure to can review the build dir
     31       n = no, I want to build the full system and review the logs
     32       y = yes, bomb at the first test suite failure to can review the build dir
    3333  -->
    34   <xsl:param name="bomb-testsuite" select="0"/>
     34  <xsl:param name="bomb-testsuite" select="n"/>
    3535
    3636  <!-- Install vim-lang package? -->
    37   <xsl:param name="vim-lang" select="1"/>
     37  <xsl:param name="vim-lang" select="y"/>
    3838
    3939  <!-- Time zone -->
    … …  
    103103            <xsl:if test="sect2[@role='installation']">
    104104              <xsl:text>cd $PKGDIR&#xA;</xsl:text>
    105               <xsl:if test="@id='ch-system-vim' and $vim-lang = '1'">
     105              <xsl:if test="@id='ch-system-vim' and $vim-lang = 'y'">
    106106                <xsl:text>tar -xvf ../vim-&vim-version;-lang.* --strip-components=1&#xA;</xsl:text>
    107107              </xsl:if>
    … …  
    126126            ($testsuite = '2' or $testsuite = '3')">
    127127      <xsl:choose>
    128         <xsl:when test="$bomb-testsuite = '0'">
     128        <xsl:when test="$bomb-testsuite = 'n'">
    129129          <xsl:value-of select="substring-before(string(),'make')"/>
    130130          <xsl:text>make -k</xsl:text>
    … …  
    198198            <xsl:if test="contains(string(),'check')">
    199199              <xsl:choose>
    200                 <xsl:when test="$bomb-testsuite = '0'">
     200                <xsl:when test="$bomb-testsuite = 'n'">
    201201                  <xsl:value-of select="substring-before(string(),'check')"/>
    202202                  <xsl:text>-k check</xsl:text>
    … …  
    223223          <xsl:when test="$testsuite != '0'">
    224224            <xsl:choose>
    225               <xsl:when test="$bomb-testsuite = '0'">
     225              <xsl:when test="$bomb-testsuite = 'n'">
    226226                <xsl:text>make -k check &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
    227227              </xsl:when>
    … …  
    243243            <xsl:value-of select="substring-before(string(),'&gt;g')"/>
    244244            <xsl:choose>
    245               <xsl:when test="$bomb-testsuite = '0'">
     245              <xsl:when test="$bomb-testsuite = 'n'">
    246246                <xsl:text>&gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
    247247              </xsl:when>

  • CLFS/config

    r5be3651 r401f81e  
    5555
    5656# Get the kernel package and patches even if no configutation file
    57 # has been supplied? 0(no)/1(yes)
    58 GETKERNEL=0
     57# has been supplied? n(no)/y(yes)
     58GETKERNEL=n
    5959
    6060#--- Book's sources directory

  • CLFS/master.sh

    r5be3651 r401f81e  
    55###          FUNCTIONS          ###
    66###################################
    7 
    87
    98
    … …  
    499498    # Skip alsp temp-perl for iterative runs
    500499    case $this_script in
    501       *stripping*) [[ "$STRIP" = "0" ]] && continue ;;
     500      *stripping*) [[ "$STRIP" = "n" ]] && continue ;;
    502501      *temp-perl*) [[ -n "$N" ]] && continue ;;
    503502    esac
    … …  
    609608    # Skip alsp temp-perl for iterative runs
    610609    case $this_script in
    611       *stripping*) [[ "$STRIP" = "0" ]] && continue ;;
     610      *stripping*) [[ "$STRIP" = "n" ]] && continue ;;
    612611      *temp-perl*) [[ -n "$N" ]] && continue ;;
    613612    esac
    … …  
    884883
    885884  # Add SBU-disk_usage report target if required
    886   if [[ "$REPORT" = "1" ]] ; then wrt_report ; fi
     885  if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
    887886
    888887}
    … …  
    963962
    964963  # Add SBU-disk_usage report target if required
    965   if [[ "$REPORT" = "1" ]] ; then wrt_report ; fi
     964  if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
    966965
    967966}
    … …  
    987986    final_system_Makefiles         # $basicsystem
    988987    # Add the iterations targets, if needed
    989     [[ "$COMPARE" != "0" ]] && wrt_compare_targets
     988    [[ "$COMPARE" = "y" ]] && wrt_compare_targets
    990989    bootscripts_Makefiles          # $bootscripttools
    991990    bootable_Makefiles             # $bootabletools
    … …  
    997996    bm_final_system_Makefiles      # $basicsystem
    998997    # Add the iterations targets, if needed
    999     [[ "$COMPARE" != "0" ]] && wrt_compare_targets
     998    [[ "$COMPARE" = "y" ]] && wrt_compare_targets
    1000999    bm_bootscripts_Makefiles       # $bootscipttools
    10011000    bm_bootable_Makefiles          # $bootabletoosl
    … …  
    10101009$HEADER
    10111010
    1012 SRC= /sources
    1013 MOUNT_PT= $BUILDDIR
    1014 PKG_LST= $PKG_LST
    1015 LUSER= $LUSER
    1016 LGROUP= $LGROUP
     1011SRC          = /sources
     1012MOUNT_PT     = $BUILDDIR
     1013PKG_LST      = $PKG_LST
     1014LUSER        = $LUSER
     1015LGROUP       = $LGROUP
     1016SCRIPT_ROOT  = $SCRIPT_ROOT
     1017
     1018BASEDIR      = \$(MOUNT_PT)
     1019SRCSDIR      = \$(BASEDIR)/sources
     1020CMDSDIR      = \$(BASEDIR)/\$(SCRIPT_ROOT)/$PROGNAME-commands
     1021LOGDIR       = \$(BASEDIR)/\$(SCRIPT_ROOT)/logs
     1022TESTLOGDIR   = \$(BASEDIR)/\$(SCRIPT_ROOT)/test-logs
     1023
     1024crSRCSDIR    = /sources
     1025crCMDSDIR    = /\$(SCRIPT_ROOT)/$PROGNAME-commands
     1026crLOGDIR     = /\$(SCRIPT_ROOT)/logs
     1027crTESTLOGDIR = /\$(SCRIPT_ROOT)/test-logs
     1028
     1029SU_LUSER     = su - \$(LUSER) -c
     1030LUSER_HOME   = /home/\$(LUSER)
     1031PRT_DU       = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n"
     1032PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) \$(MOUNT_PT)\`\n"
     1033
    10171034
    10181035include makefile-functions
Note: See TracChangeset for help on using the changeset viewer.