Changeset bc8cca5


Ignore:
Timestamp:
06/10/2020 08:44:16 PM (4 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc
Children:
387a32af
Parents:
67d1e79
Message:

Text updates to cross2 branch Chapter 6

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/cross2@11917 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:
13 edited

Legend:

Unmodified
Added
Removed

  • chapter06/bash.xml

    r67d1e79 rbc8cca5  
    7575<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
    7676
    77     <para>Move the excutable to where it is expected to be:</para>
     77    <para>Move the excutable to where it is expected:</para>
    7878
    7979<screen><userinput remap="install">mv $LFS/usr/bin/bash $LFS/bin/bash</userinput></screen>

  • chapter06/coreutils.xml

    r67d1e79 rbc8cca5  
    8585
    8686<screen><userinput remap="install">mv -v $LFS/usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} $LFS/bin
    87 mv -v $LFS/usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} $LFS/bin
    88 mv -v $LFS/usr/bin/{rmdir,stty,sync,true,uname} $LFS/bin
    89 mv -v $LFS/usr/bin/chroot $LFS/usr/sbin
     87mv -v $LFS/usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm}        $LFS/bin
     88mv -v $LFS/usr/bin/{rmdir,stty,sync,true,uname}               $LFS/bin
     89mv -v $LFS/usr/bin/{head,nice,sleep,touch}                    $LFS/bin
     90mv -v $LFS/usr/bin/chroot                                     $LFS/usr/sbin
    9091mkdir -pv $LFS/usr/share/man/man8
    91 mv -v $LFS/usr/share/man/man1/chroot.1 $LFS/usr/share/man/man8/chroot.8
    92 sed -i s/\"1\"/\"8\"/1 $LFS/usr/share/man/man8/chroot.8
    93 mv -v $LFS/usr/bin/{head,nice,sleep,touch} $LFS/bin</userinput></screen>
     92mv -v $LFS/usr/share/man/man1/chroot.1                        $LFS/usr/share/man/man8/chroot.8
     93sed -i 's/"1"/"8"/'                                           $LFS/usr/share/man/man8/chroot.8</userinput></screen>
    9494
    9595  </sect2>

  • chapter06/file.xml

    r67d1e79 rbc8cca5  
    4646    <para>Prepare File for compilation:</para>
    4747
    48 <screen><userinput remap="configure">./configure --prefix=/usr   \
    49             --host=$LFS_TGT</userinput></screen>
     48<screen><userinput remap="configure">./configure --prefix=/usr --host=$LFS_TGT</userinput></screen>
    5049
    5150<!-- devs: if using - -build here, the build system wants to compile

  • chapter06/gcc-pass2.xml

    r67d1e79 rbc8cca5  
    6060<screen><userinput remap="pre">case $(uname -m) in
    6161  x86_64)
    62     sed -e '/m64=/s/lib64/lib/' \
    63         -i.orig gcc/config/i386/t-linux64
     62    sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64
    6463  ;;
    6564esac</userinput></screen>
    … …  
    7574cd       build</userinput></screen>
    7675
    77     <para>Create a symlink that allos libgcc to be built with posix threads
     76    <para>Create a symlink that allows libgcc to be built with posix threads
    7877    support:</para>
    7978
    … …  
    110109        <term><parameter>-with-build-sysroot=$LFS</parameter></term>
    111110        <listitem>
    112           <para>Normally, using <parameter>--host=</parameter> ensures that
     111          <para>Normally, using <parameter>--host</parameter> ensures that
    113112          a cross-compiler is used for building gcc, and that compiler knows
    114113          that it has to look for headers and libraries in <filename
    … …  
    139138<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
    140139
    141     <para>As a finishing touch, create a symlink. Many programs and scripts
     140    <para>As a finishing touch, create a utility symlink. Many programs and scripts
    142141    run <command>cc</command> instead of <command>gcc</command>, which is
    143142    used to keep programs generic and therefore usable on all kinds of UNIX

  • chapter06/introduction.xml

    r67d1e79 rbc8cca5  
    1414  the just built cross-toolchain. Those utilities are installed into
    1515  their final location, but cannot be used yet. Basic tasks still rely on
    16   the hosts tools. Nevertheless, the installed libraries are used when
     16  the host's tools. Nevertheless, the installed libraries are used when
    1717  linking.</para>
    1818
    1919  <para>Using the utilities will be possible in next chapter after entering
    2020  the <quote>chroot</quote> environment. But all the packages built in the
    21   present chapter need themselves to be built. So we cannot be independent
    22   on the build system yet.</para>
     21  present chapter need to be built before we do that. Therefore we cannot be
     22  independent of the host system yet.</para>
    2323
    2424  <para>Once again, let us recall that improper setting of <envar>LFS</envar>

  • chapter06/ncurses.xml

    r67d1e79 rbc8cca5  
    5252
    5353<screen><userinput remap="pre">mkdir build
    54 cd build
    55 ../configure
    56 make -C include
    57 make -C progs tic
    58 cd ..</userinput></screen>
     54pushd build
     55  ../configure
     56  make -C include
     57  make -C progs tic
     58popd</userinput></screen>
    5959
    6060    <para>Prepare Ncurses for compilation:</para>

  • chapter06/tar.xml

    r67d1e79 rbc8cca5  
    6464    <title/>
    6565
    66     <para>Details on this package are located in
    67     <xref linkend="contents-tar" role="."/></para>
     66    <para>Details on this package are located in <xref linkend="contents-tar" role="."/></para>
    6867
    6968  </sect2>

  • chapter06/xz.xml

    r67d1e79 rbc8cca5  
    6262    <para>Make sure that all essential files are in the correct directory:</para>
    6363
    64 <screen><userinput remap="install">mv -v   $LFS/usr/bin/{lzma,unlzma,lzcat,xz,unxz,xzcat} $LFS/bin
    65 mv -v $LFS/usr/lib/liblzma.so.* $LFS/lib
     64<screen><userinput remap="install">mv -v $LFS/usr/bin/{lzma,unlzma,lzcat,xz,unxz,xzcat} $LFS/bin
     65mv -v $LFS/usr/lib/liblzma.so.*                       $LFS/lib
    6666ln -svf ../../lib/$(readlink $LFS/usr/lib/liblzma.so) $LFS/usr/lib/liblzma.so</userinput></screen>
    6767
    … …  
    7070  <sect2 role="content">
    7171    <title/>
    72     <para>Details on this package are located in<!-- TODO
    73     <xref linkend="contents-xz" role="."/>      --></para>
     72    <para>Details on this package are located in <xref linkend="contents-xz" role="."/></para>
    7473
    7574  </sect2>

  • chapter08/findutils.xml

    r67d1e79 rbc8cca5  
    2727    are provided to recursively search through a directory tree and to
    2828    create, maintain, and search a database (often faster than the recursive
    29     find, but unreliable if the database has not been recently updated).</para>
     29    find, but is unreliable if the database has not been recently updated).</para>
    3030
    3131    <segmentedlist>

  • chapter08/grep.xml

    r67d1e79 rbc8cca5  
    2424    <title/>
    2525
    26     <para>The Grep package contains programs for searching through files.</para>
     26    <para>The Grep package contains programs for searching through teh contents of files.</para>
    2727
    2828    <segmentedlist>

  • chapter08/make.xml

    r67d1e79 rbc8cca5  
    2424    <title/>
    2525
    26     <para>The Make package contains a program for compiling packages.</para>
     26    <para>The Make package contains a program for controlling the generation of
     27    executables and other non-source files of a program from the program's
     28    source files. .</para>
    2729
    2830    <segmentedlist>

  • chapter08/tar.xml

    r67d1e79 rbc8cca5  
    2424    <title/>
    2525
    26     <para>The Tar package contains an archiving program.</para>
     26    <para>The Tar package provides the ability to create tar archives, as well
     27    as various other kinds of manipulation.  Tar can be used on
     28    previously created archives to extract files, to store additional files, or
     29    to update or list files which were already stored. </para>
    2730
    2831    <segmentedlist>

  • general.ent

    r67d1e79 rbc8cca5  
    1 <!ENTITY version         "20200608-cross2">
     1<!ENTITY version         "20200610-cross2">
    22<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;
    33                                      Change to x.y for release but not -rc releases -->
    44<!ENTITY generic-version "cross-chap5"> <!-- Use "development"  or "x.y[-pre{x}]" -->
    55
    6 <!ENTITY versiond        "20200608-cross2-systemd">
     6<!ENTITY versiond        "20200610-cross2-systemd">
    77<!ENTITY short-versiond  "systemd">
    8 <!ENTITY generic-versiond "20200608-cross2-systemd">
     8<!ENTITY generic-versiond "20200610-cross2-systemd">
    99
    10 <!ENTITY releasedate     "June 8th, 2020">
     10<!ENTITY releasedate     "June 10th, 2020">
    1111
    1212<!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
Note: See TracChangeset for help on using the changeset viewer.