Changeset 4fb696f


Ignore:
Timestamp:
09/17/2022 08:45:24 PM (19 months ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, bdubbs/gcc13, multilib, renodr/libudev-from-systemd, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc
Children:
ade9602
Parents:
13342a0 (diff), b6a6f6c7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • chapter08/gawk.xml

    r13342a0 r4fb696f  
    4747    <para>Now fix a programming error identified upstream:</para>
    4848
    49 <screen><userinput remap="pre">sed -i -i '241i UPREF(m);' interpret.h</userinput></screen>
     49<screen><userinput remap="pre">sed -i '241i UPREF(m);' interpret.h</userinput></screen>
    5050
    5151    <para>Prepare Gawk for compilation:</para>

  • chapter11/afterlfs.xml

    r13342a0 r4fb696f  
    2525     <para>
    2626        A server is the simpler category. Generally this consists of a web
    27         server such as the 
     27        server such as the
    2828        <ulink url="&blfs-book;server/apache.html">Apache HTTP Server</ulink>
    2929        and a database server such as
    30         <ulink url="&blfs-book;server/mariadb.html">MariaDB</ulink>. 
     30        <ulink url="&blfs-book;server/mariadb.html">MariaDB</ulink>.
    3131        However other services are possible. The operating system
    3232        embedded in a single use device falls into this category.
    … …  
    3535     <para>
    3636        On the other hand, a workstation is much more complex. It generally
    37         requires a graphical user environment such as 
    38         <ulink url="&blfs-book;lxde/lxde.html">LXDE</ulink>, 
    39         <ulink url="&blfs-book;xfce/xfce.html">XFCE</ulink>, 
    40         <ulink url="&blfs-book;kde/kde.html">KDE</ulink>, or 
     37        requires a graphical user environment such as
     38        <ulink url="&blfs-book;lxde/lxde.html">LXDE</ulink>,
     39        <ulink url="&blfs-book;xfce/xfce.html">XFCE</ulink>,
     40        <ulink url="&blfs-book;kde/kde.html">KDE</ulink>, or
    4141        <ulink url="&blfs-book;gnome/gnome.html">Gnome</ulink>
    42         based on the
    43         <ulink url="&blfs-book;x/installing.html">X Window graphical environment</ulink>
     42        based on a basic
     43        <ulink url="&blfs-book;x/installing.html">graphical environment</ulink>
    4444        and several graphical based applications such as the
    45         <ulink url="&blfs-book;xsoft/firefox.html">Firefox web browser</ulink>, 
     45        <ulink url="&blfs-book;xsoft/firefox.html">Firefox web browser</ulink>,
    4646        <ulink url="&blfs-book;xsoft/thunderbird.html">Thunderbird email client</ulink>,
    47         or 
    48         <ulink url="&blfs-book;xsoft/libreoffice.html">LibreOffice office suite</ulink>. 
     47        or
     48        <ulink url="&blfs-book;xsoft/libreoffice.html">LibreOffice office suite</ulink>.
    4949        These applications require many (several hundred depending on
    5050        desired capabilities) more packages of support applications and
    … …  
    5555        In addition to the above, there is a set of applications that are
    5656        suitable for all systems for system management. These applications are
    57         all in the full BLFS book. Not
    58         all packages are needed in all environments. For example 
    59         <ulink url="&blfs-book;basicnet/dhcpcd.html">dhcpcd</ulink>, 
    60         is not appropriate for a server and 
    61         <ulink url="&blfs-book;basicnet/wireless_tools.html">wireless_tools</ulink>, 
     57        all in the BLFS book. Not
     58        all packages are needed in all environments. For example
     59        <ulink url="&blfs-book;basicnet/dhcpcd.html">dhcpcd</ulink>,
     60        is not appropriate for a server and
     61        <ulink url="&blfs-book;basicnet/wireless_tools.html">wireless_tools</ulink>,
    6262        are normally only
    6363        useful for a laptop system. If you are not sure if a package presented
    … …  
    6969
    7070  <sect2>
    71   <title>Working in a partial BLFS environment</title>
     71  <title>Working in a basic LFS environment</title>
    7272
    7373    <para>
    7474      When you initially boot into LFS, you have all the internal tools to build
    7575      additional packages. Unfortunately, the user environment is quite sparse.
    76       There are a couple of ways to improve this: 
     76      There are a couple of ways to improve this:
    7777    </para>
    7878
    … …  
    9191       In order to properly build packages in chroot, you will also need to
    9292       remember to mount the virtual file systems if they are not already
    93        mounted. One way to do this is to create a script on the 
    94        <command>HOST</command> system:
     93       mounted. One way to do this is to create a script on the
     94       <emphasis role="bold">HOST</emphasis> system:
    9595    </para>
    9696
    … …  
    101101{
    102102   if ! mountpoint $LFS/$1 >/dev/null; then
    103      $SUDO mount - -bind /$1 $LFS/$1
     103     $SUDO mount --bind /$1 $LFS/$1
    104104     echo $LFS/$1 mounted
    105105   else
    … …  
    111111{
    112112   if ! mountpoint $LFS/$1 >/dev/null; then
    113      $SUDO mount -t $2 $3 $4 $5 $LFS/$1 
     113     $SUDO mount -t $2 $3 $4 $5 $LFS/$1
    114114     echo $LFS/$1 mounted
    115115   else
    … …  
    129129fi
    130130
    131 mountbind dev 
     131mountbind dev
    132132mounttype dev/pts devpts devpts -o gid=5,mode=620
    133133mounttype proc    proc   proc
    … …  
    143143       Note that the last three commands in the script are commented out. These
    144144       are useful if those directories are mounted as separate partitions on the
    145        host system and will be mounted when booting the completed LFS/BLFS system. 
     145       host system and will be mounted when booting the completed LFS/BLFS system.
    146146    </para>
    147147
    148148    <para>
    149149        The script can be run with <command>bash ~/mount-virt.sh</command> as
    150         either a regular user (recommended) or as root. If run as a regular
     150        either a regular user (recommended) or as &root;. If run as a regular
    151151        user, sudo is required on the host system.
    152152    </para>
    … …  
    167167    </para>
    168168
    169 <screen><command>alias lfs='sudo /usr/sbin/chroot /mnt/lfs /usr/bin/env -i HOME=/root TERM="$TERM" PS1="\u:\w\\\\$ " 
    170 PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash - -login'</command></screen>
     169<screen><command>alias lfs='sudo /usr/sbin/chroot /mnt/lfs /usr/bin/env -i HOME=/root TERM="$TERM" PS1="\u:\w\\\\$ "
     170PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash --login'</command></screen>
    171171
    172172     <para>
    … …  
    183183    <para>
    184184       This method also provides a full graphical environment, but first
    185        requires installing 
     185       requires installing
    186186        <ulink url="&blfs-book;postlfs/openssh.html">sshd</ulink> and
    187         <ulink url="&blfs-book;basicnet/wget.html">wget</ulink> 
     187        <ulink url="&blfs-book;basicnet/wget.html">wget</ulink>
    188188       on the LFS system, usually in chroot. It also requires a second
    189189       computer. This method has the advantage of being simple by not requiring
    190190       the complexity of the chroot environment. It also uses your LFS built
    191191       kernel for all additional packages and still provides a complete system
    192        for installing packages. 
     192       for installing packages.
    193193    </para>
    194194
    … …  
    199199
    200200    <para>
    201        This method requiures installing
     201       This method requires installing
     202        <ulink url="&blfs-book;general/libtasn1.html">libtasn1</ulink>,
     203        <ulink url="&blfs-book;postlfs/p11-kit.html">p11-kit</ulink>,
    202204        <ulink url="&blfs-book;postlfs/make-ca.html">make-ca</ulink>,
    203         <ulink url="&blfs-book;basicnet/wget.html">wget</ulink>, 
     205        <ulink url="&blfs-book;basicnet/wget.html">wget</ulink>,
    204206        <ulink url="&blfs-book;general/gpm.html">gpm</ulink>, and
    205         <ulink url="&blfs-book;basicnet/links">links</ulink>
    206        in chroot and then rebooting into the new LFS system. At this
    207        point the default system has six virtual consoles. Switching
    208        consoles is as easy as using the Alt-Fn key combinations where Fn is
    209        between F1 and F6.  The Alt-LeftArrow and Alt-RightArrow key
     207        <ulink url="&blfs-book;basicnet/links.html">links</ulink>
     208        (or <ulink url="&blfs-book;basicnet/lynx.html">lynx</ulink>)
     209       in chroot and then rebooting into the new LFS system. At this
     210       point the default system has six virtual consoles. Switching
     211       consoles is as easy as using the
     212       <keycombo>
     213         <keycap>Alt</keycap>
     214         <keycap>Fx</keycap>
     215       </keycombo>
     216       key combinations where <keycap>Fx</keycap> is
     217       between <keycap>F1</keycap> and <keycap>F6</keycap>.
     218       The
     219       <keycombo>
     220         <keycap>Alt</keycap>
     221         <keycap function='left'/>
     222       </keycombo>
     223       and
     224       <keycombo>
     225         <keycap>Alt</keycap>
     226         <keycap function='right'/>
     227       </keycombo>
    210228       combinations also will change the console.
    211229     </para>
    212      
     230
    213231     <para>
    214232       At this point you can log into two different virtual consoles and run
    215        the links browser in one console and bash in the other. GPM then allows
    216        copying commands from the browser with the left mouse button, switching
    217        consoles, and pasting into the other console.
     233       the links or lynx browser in one console and bash in the other. GPM
     234       then allows copying commands from the browser with the left mouse
     235       button, switching consoles, and pasting into the other console.
    218236      </para>
    219237
    … …  
    221239        <para>
    222240          As a side note, switching of virtual consoles can also be done from
    223           an X Window instance with the Ctrl-Alt-Fn key combination, but the
    224           mouse copy operation does not work between the graphical interface
    225           and a virtual console. You can return to the X Window display with
    226           the Ctrl-Alt-Fn conbination where Fn is usually F7.
     241          an X Window instance with the
     242          <keycombo>
     243            <keycap>Ctrl</keycap>
     244            <keycap>Alt</keycap>
     245            <keycap>Fx</keycap>
     246          </keycombo>
     247          key combination, but the mouse copy operation does not work
     248          between the graphical interface and a virtual console. You can
     249          return to the X Window display with the
     250          <keycombo>
     251            <keycap>Ctrl</keycap>
     252            <keycap>Alt</keycap>
     253            <keycap>Fx</keycap>
     254          </keycombo>
     255          combination, where <keycap>Fx</keycap> may be <keycap>F7</keycap>.
    227256        </para>
    228257      </note>
Note: See TracChangeset for help on using the changeset viewer.