Changeset f4d9a48


Ignore:
Timestamp:
11/06/2006 07:41:19 PM (17 years ago)
Author:
George Boudreau <georgeb@…>
Branches:
2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
40700e9
Parents:
c2af6709
Message:

Remove \t from make messages, not compat with sh. Correct chroot extraction for CLFS to match book

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • CLFS/master.sh

    rc2af6709 rf4d9a48  
    11711171                -e 's|exit||g' \
    11721172                -e 's|$| -c|' \
    1173                 -e 's|"$$CLFS"|$(MOUNT_PT)|'\
     1173                -e 's|"$${CLFS}"|$(MOUNT_PT)|'\
    11741174                -e 's|set -e||'`
    11751175    echo -e "CHROOT1= $chroot\n" >> $MKFILE
    … …  
    12251225          sudo chown -R 0:0 \$(MOUNT_PT)/bin; \\
    12261226        fi;
    1227         @sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chroot/082-createfiles
     1227        @sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chroot/*-createfiles
    12281228        @\$(call echo_CHROOT_request)
    12291229        @\$(call echo_PHASE, CHROOT JAIL )

  • LFS/lfs.xsl

    rc2af6709 rf4d9a48  
    7373        </xsl:choose>
    7474      </xsl:variable>
     75
    7576        <!-- Creating dirs and files -->
    7677      <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
     78<!--
    7779        <xsl:choose>
    7880          <xsl:when test="@id='ch-system-changingowner' or
    … …  
    8991          </xsl:otherwise>
    9092        </xsl:choose>
    91         <xsl:if test="sect2[@role='installation']">
    92           <xsl:text>cd $PKGDIR&#xA;</xsl:text>
    93           <xsl:if test="@id='ch-system-vim' and $vim-lang = 'y'">
    94             <xsl:text>tar -xvf ../vim-&vim-version;-lang.* --strip-components=1&#xA;</xsl:text>
    95           </xsl:if>
    96         </xsl:if>
     93-->
    9794        <xsl:apply-templates select=".//para/userinput | .//screen"/>
    9895        <xsl:if test="$testsuite='3' and @id='ch-tools-glibc'">
    … …  
    10097          <xsl:text>&#xA;</xsl:text>
    10198        </xsl:if>
    102         <xsl:text>exit</xsl:text>
    10399      </exsl:document>
     100
     101
    104102    </xsl:if>
    105103  </xsl:template>

  • common/makefile-functions

    rc2af6709 rf4d9a48  
    1414REVERSE = "[7m"
    1515
     16tab_    ='\t'
     17nl_     ='\n'
    1618
    1719define echo_PHASE
    1820  @clear
    1921  @echo $(BOLD)--------------------------------------------------------------------------------
    20   @echo -e \\t\\tExecuting $(BLUE)$(1)$(WHITE) scripts
     22  @echo  $(tab_)$(tab_)Executing $(BLUE)$(1)$(WHITE) scripts
    2123  @echo $(BOLD)--------------------------------------------------------------------------------
    2224  #echo $(WHITE)
    … …  
    136138  @echo $(BOLD) Finished the build of $(BLUE)$(1)$(BOLD)
    137139  @echo --------------------------------------------------------------------------------
    138   @echo -e \\t\\t$(RED)W A R N I N G$(BOLD)
     140  @echo  $(tab_)$(tab_)$(RED)W A R N I N G$(BOLD)
    139141  @echo --------------------------------------------------------------------------------
    140142  @echo
    … …  
    142144  @echo the next steps:$(WHITE)
    143145  @echo
    144   @echo -e \\t- Enter to the chroot using the command found
    145   @echo -e \\tin the section -Entering the Chroot Environment-
    146   @echo -e \\texcept if building CLFS with METHOD=boot.
     146  @echo  $(tab_)- Enter to the chroot using the command found
     147  @echo  $(tab_)in the section -Entering the Chroot Environment-
     148  @echo  $(tab_)except if building CLFS with METHOD=boot.
    147149  @echo
    148   @echo -e \\t- Set a password for the root user.
     150  @echo  $(tab_)- Set a password for the root user.
    149151  @echo
    150   @echo -e \\t- Edit or create /etc/fstab, /etc/hosts, /etc/sysconfig/clock,
    151   @echo -e \\t/etc/sysconfig/console, /etc/sysconfig/network,
    152   @echo -e \\t/etc/sysconfig//network-devices/ifconfig.eth0/ipv4 and
    153   @echo -e \\tany other configuration file required to suit your needs.
     152  @echo  $(tab_)- Edit or create /etc/fstab, /etc/hosts, /etc/sysconfig/clock,
     153  @echo  $(tab_)/etc/sysconfig/console, /etc/sysconfig/network,
     154  @echo  $(tab_)/etc/sysconfig//network-devices/ifconfig.eth0/ipv4 and
     155  @echo  $(tab_)any other configuration file required to suit your needs.
    154156  @echo
    155   @echo -e \\t- Exit from the chroot.
     157  @echo  $(tab_)- Exit from the chroot.
    156158  @echo
    157   @echo -e \\t- Set-up the boot loader, except if building CLFS with METHOD=boot.
    158   @echo -e \\tYou can set-up the host bootloader or the new boot-loader
    159   @echo -e \\tinstalled on the new system.
    160   @echo -e \\tIf the last, you must to mount the virtual filesystems, re-enter
    161   @echo -e \\tthe chroot and be sure that /dev is populated with the
    162   @echo -e \\trequired devices before configure the boot-loader. When ready,
    163   @echo -e \\texit from the chroot and umount the filesystems
     159  @echo  $(tab_)- Set-up the boot loader, except if building CLFS with METHOD=boot.
     160  @echo  $(tab_)You can set-up the host bootloader or the new boot-loader
     161  @echo  $(tab_)installed on the new system.
     162  @echo  $(tab_)If the last, you must to mount the virtual filesystems, re-enter
     163  @echo  $(tab_)the chroot and be sure that /dev is populated with the
     164  @echo  $(tab_)required devices before configure the boot-loader. When ready,
     165  @echo  $(tab_)exit from the chroot and umount the filesystems
    164166  @echo
    165167  @echo If you are an experienced LFS user, several of those steps can be
    … …  
    168170  @echo $(BOLD)
    169171  @echo --------------------------------------------------------------------------------
    170   @echo -e \\t\\t$(GREEN)Have a nice day $(ORANGE):-\)$(BOLD)
     172  @echo  $(tab_)$(tab_)$(GREEN)Have a nice day $(ORANGE):-\)$(BOLD)
    171173  @echo --------------------------------------------------------------------------------$(WHITE)
    172174endef
    … …  
    177179  @echo        $(BOLD) Finished building a minimal boot system for $(BLUE)$(1)$(BOLD)
    178180  @echo --------------------------------------------------------------------------------
    179   @echo -e \\t\\t$(RED)W A R N I N G$(BOLD)
     181  @echo  $(tab_)$(tab_)$(RED)W A R N I N G$(BOLD)
    180182  @echo --------------------------------------------------------------------------------
    181183  @echo
    182184  @echo The build is not complete. Follow the next steps:$(WHITE)
    183185  @echo
    184   @echo -e \\t- Edit or create $(MOUNT_PT)/etc/fstab
    185   @echo -e \\t and any other configuration file required to suit your needs.
     186  @echo  $(tab_)- Edit or create $(MOUNT_PT)/etc/fstab
     187  @echo  $(tab_) and any other configuration file required to suit your needs.
    186188  @echo $(BOLD)
    187189  @echo $(BOLD)$(YELLOW)
    … …  
    189191  @echo  2.Boot the new partition.
    190192  @echo  3.Once you are logged in issue the following commands
    191   @echo -e \\t $(BOLD})cd /jhalfs
    192   @echo -e \\t $(BOLD)make makesys
     193  @echo  $(tab_) $(BOLD})cd /jhalfs
     194  @echo  $(tab_) $(BOLD)make makesys
    193195  @echo  The build process should resume. Follow any instructions that appear.
    194196  @echo --------------------------------------------------------------------------------
    195   @echo -e \\t\\t$(GREEN)Have a nice day $(ORANGE):-\)$(BOLD)
     197  @echo  $(tab_)$(tab_)$(GREEN)Have a nice day $(ORANGE):-\)$(BOLD)
    196198  @echo --------------------------------------------------------------------------------$(WHITE)
    197199endef
Note: See TracChangeset for help on using the changeset viewer.