Changeset 6c67242 for chapter06


Ignore:
Timestamp:
09/20/2018 05:02:36 PM (6 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, 8.4, 9.0, 9.1, 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:
cc09c07
Parents:
9a76847
Message:

Clean up of unneeded symbolic links.
Reordered packages so version specific packages are
built as late as possible in Chapter 6. Now building
util-linux in Chapter 5 is unneeded and has been removed.

Update to eudev-3.2.6.
Update to elfutils-0.174 (libelf).
Update to psmisc-23.2.
Update to openssl-1.1.1.
Update to linux-4.18.9.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11472 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:
chapter06
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • chapter06/chapter06.xml

    r9a76847 r6c67242  
    4040  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
    4141  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
    42 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>-->
    4342  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
    4443  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
    … …  
    6665  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ninja.xml"/>
    6766  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="meson.xml"/>
    68 
    69   <!-- systemd only -->
    70   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
    71 
    72   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
    73   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
    7467  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
    7568  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/>
    … …  
    8679  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
    8780  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
     81  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
     82  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
     83  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
     84  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
     85  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
     86  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
    8887
    8988  <!-- systemd only -->
     89  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
    9090  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
     91  <!-- props needs libsystemd -->
     92  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
    9193
    9294  <!-- sysv only -->
    … …  
    9597  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
    9698
    97   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
    98   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
    99   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
    100   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
    101   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
    10299  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
    103100  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/>

  • chapter06/createfiles.xml

    r9a76847 r6c67242  
    4040  software has been installed:</para>
    4141
    42 <!--
    43 <screen revision="sysv"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
    44 ln -sv /tools/bin/{install,perl} /usr/bin
    45 ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
    46 ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
    47 ln -sv bash /bin/sh
    48 
    49 
    50 </userinput></screen>
    51 -->
    52 <!--sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la -->
    53 
    54 <!--<screen revision="systemd"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin-->
    5542<screen><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
    56 ln -sv /tools/bin/{env,install,perl} /usr/bin
    57 ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
    58 ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
    59 for lib in blkid lzma mount uuid
     43ln -sv /tools/bin/{env,install,perl}                /usr/bin
     44ln -sv /tools/lib/libgcc_s.so{,.1}                  /usr/lib
     45ln -sv /tools/lib/libstdc++.{a,so{,.6}}             /usr/lib
     46
     47install -vdm755 /usr/lib/pkgconfig
     48
     49ln -sv bash /bin/sh</userinput></screen>
     50
     51<!--for lib in blkid lzma mount uuid
    6052do
    6153    ln -sv /tools/lib/lib$lib.so* /usr/lib
    62 done
    63 ln -svf /tools/include/blkid    /usr/include
     54done-->
     55<!--ln -svf /tools/include/blkid    /usr/include
    6456ln -svf /tools/include/libmount /usr/include
    65 ln -svf /tools/include/uuid     /usr/include
    66 install -vdm755 /usr/lib/pkgconfig
    67 for pc in blkid mount uuid
     57ln -svf /tools/include/uuid     /usr/include-->
     58<!--for pc in blkid mount uuid
    6859do
    6960    sed 's@tools@usr@g' /tools/lib/pkgconfig/${pc}.pc \
    7061        > /usr/lib/pkgconfig/${pc}.pc
    71 done
    72 ln -sv bash /bin/sh</userinput></screen>
    73 
    74 <!--sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
    75    sed 's/tools/usr/' /tools/lib/lib${lib}.la > /usr/lib/lib${lib}.la-->
     62done-->
    7663  <variablelist>
    7764    <title>The purpose of each link:</title>
    … …  
    10592        <para>This is to satisfy one of the tests in Glibc's test suite, which
    10693        expects <filename>/bin/echo</filename>.</para>
     94      </listitem>
     95    </varlistentry>
     96
     97    <varlistentry>
     98      <term><parameter><filename>/usr/bin/env</filename></parameter></term>
     99      <listitem>
     100        <para>This pathname is hard-coded into some packages build procedures.
     101        <!-- systemd  This may not be needed if we move sysd to the end--></para>
    107102      </listitem>
    108103    </varlistentry>
    … …  
    183178-->
    184179    <!--<varlistentry revision="systemd">-->
    185     <varlistentry>
     180<!--    <varlistentry>
    186181      <term><parameter><filename>/usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*}</filename></parameter></term>
    187182      <listitem>
    188         <para>These links prevent <!--systemd--> utilities from acquiring an
     183        <para>These links prevent utilities from acquiring an
    189184        unnecessary reference to the
    190185        <filename class="directory">/tools</filename> directory.</para>
    191186      </listitem>
    192     </varlistentry>
     187    </varlistentry>-->
    193188
    194189    <varlistentry>

  • chapter06/e2fsprogs.xml

    r9a76847 r6c67242  
    118118
    119119<screen><userinput remap="make">make</userinput></screen>
    120 
     120<!--
    121121    <para>To set up and run the test suite we need to first link some
    122122    libraries from /tools/lib to a location where the test programs look.
    123123    To run the tests, issue:</para>
    124 
    125 <screen><userinput remap="test">ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib
    126 make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>
     124-->
     125
     126    <para>To run the tests, issue:</para>
     127
     128<screen><userinput remap="test">make check</userinput></screen>
     129<!--ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib -->
     130<!--make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>-->
    127131
    128132    <para>One of the E2fsprogs tests will attempt to allocate 256 MB of memory.

  • chapter06/libelf.xml

    r9a76847 r6c67242  
    1515  </sect1info>
    1616
    17   <title>Libelf &elfutils-version;</title>
     17  <title>Libelf from Elfutils-&elfutils-version;</title>
    1818
    1919  <indexterm zone="ch-system-libelf">

  • chapter06/make.xml

    r9a76847 r6c67242  
    4141    <title>Installation of Make</title>
    4242
    43     <para>Again, work around an error caused by glibc-2.27:</para>
     43    <para>Again, work around an error caused by glibc-2.27 and later:</para>
    4444
    4545<screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen>
Note: See TracChangeset for help on using the changeset viewer.