Changeset 26ae89a


Ignore:
Timestamp:
01/02/2016 12:00:54 PM (8 years ago)
Author:
DJ Lucas <dj@…>
Branches:
7.9-systemd
Children:
ee46f60
Parents:
6e13139
Message:

Fix systemd chapter 6 build, move util-linux back to end of chapter 6, remove sysmlink for /etc/resolv.conf

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

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • appendices/dependencies.xml

    r6e13139 r26ae89a  
    421421
    422422        <seglistitem>
    423           <seg>Bash, Diffutils, Findutils, Man-DB, and Udev</seg>
     423          <seg>Bash, Diffutils, Findutils, Man-DB, and Systemd</seg>
    424424        </seglistitem>
    425425      </segmentedlist>
    … …  
    22722272        <seglistitem>
    22732273         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
    2274          Gettext, Glibc, Grep, Make, Ncurses, Sed, Udev, and Zlib</seg>
     2274         Gettext, Glibc, Grep, Make, Ncurses, Sed, Systemd, and Zlib</seg>
    22752275        </seglistitem>
    22762276      </segmentedlist>
    … …  
    23942394
    23952395        <seglistitem>
    2396           <seg>GRUB, Kmod, Man-DB, Udev</seg>
     2396          <seg>GRUB, Kmod, Man-DB, Systemd</seg>
    23972397        </seglistitem>
    23982398      </segmentedlist>

  • chapter01/changelog.xml

    r6e13139 r26ae89a  
    3838
    3939    <listitem>
     40      <para>2016-01-02</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[dj] - Fix build of systemd with libblkid and libmount in
     44          /tools/lib and move util-linux to its previous build order to
     45          solve reciprocal dependency.</para>
     46        </listitem>
     47        <listitem>
     48          <para>[dj] - Removed /etc/resolv.conf symlink in network
     49          configuration as it is created automatically if needed.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
     53
     54    <listitem>
    4055      <para>2016-01-01</para>
    4156      <itemizedlist>

  • chapter06/chapter06.xml

    r6e13139 r26ae89a  
    5959  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
    6060  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
    61   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
    6261  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
    6362  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
    … …  
    7776  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
    7877  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
     78  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
    7979  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
    8080  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>

  • chapter06/systemd.xml

    r6e13139 r26ae89a  
    4141    <title>Installation of systemd</title>
    4242
    43     <para>First, create a file to allow systemd to build when using Util-Linux
     43    <para>First, fix a build error when using Util-Linux built in
     44    Chapter 5:</para>
     45
     46<screen><userinput remap="pre">sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")</userinput></screen>
     47
     48    <para>Apply the following patch so that compat
     49    <command>pkg-config</command> files get installed without installing compat
     50    libs which are useless on LFS:</para>
     51
     52<screen><userinput remap="pre">patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
     53
     54    <para>Disable two tests that always fail:</para>
     55
     56<screen><userinput remap="pre">sed -e 's:test/udev-test.pl ::g'  \
     57    -e 's:test-copy$(EXEEXT) ::g' \
     58    -i Makefile.in</userinput></screen>
     59
     60    <para>Rebuild generated files after modifying Makefile.am and
     61    Makefile.in:</para>
     62
     63<screen><userinput remap="pre">autoreconf -fi</userinput></screen>
     64
     65    <para>Create a file to allow systemd to build when using Util-Linux
    4466    built in Chapter 5, to disable LTO by default, and to build without
    4567    xlstproc:</para>
    … …  
    5981EOF</userinput></screen>
    6082
    61     <para>LTO is disabled by default because it causes <command>systemd</command>
    62     and other auxiliary programs to link to <filename
    63     class="libraryfile">libgcc_s.so</filename>, slows the build down and makes the
    64     compiled code larger.</para>
    65 
    66     <para>Additionally, fix a build error when using Util-Linux built in
    67     Chapter 5:</para>
    68 
    69 <screen><userinput remap="pre">sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")</userinput></screen>
    70 
    71     <para>Apply the following patch so that compat <command>pkg-config</command> files
    72     get installed without installing compat libs which are useless on LFS:</para>
    73 
    74 <screen><userinput remap="pre">patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
    75 
    76     <para>Disable two tests that always fail:</para>
    77 
    78 <screen><userinput remap="pre">sed -e 's:test/udev-test.pl ::g'  \
    79     -e 's:test-copy$(EXEEXT) ::g' \
    80     -i Makefile.in</userinput></screen>
     83    <para>LTO is disabled by default because it causes
     84    <command>systemd</command> and other auxiliary programs to link to
     85    <filename class="libraryfile">libgcc_s.so</filename>, slows the build down
     86    and makes the compiled code larger.</para>
    8187
    8288    <para>Prepare systemd for compilation:</para>

  • chapter07/network.xml

    r6e13139 r26ae89a  
    116116      <para>When using <command>systemd-resolved</command> for DNS
    117117      configuration, it is responsible for creating the
    118       <filename>/etc/resolv.conf</filename> file, which is placed in a
    119       non-standard location that is writable during early boot. In order to be
    120       used by other components of the system, it is necessary to create a
    121       symlink with the following command:</para>
    122 
    123 <screen><userinput>ln -sfv /run/systemd/resolve/resolv.conf /etc/resolv.conf</userinput></screen>
    124 
    125       <para>This is required if you are specifying DNS entries in <filename
    126       class="extension">.network</filename> files or using the built in
    127       DHCP client to obtain DNS addresses.</para>
     118      <filename>/etc/resolv.conf</filename> file. Since version 226, the
     119      symlink for <filename>/etc/resolv.conf</filename> is created by systemd
     120      when needed, so no further configuration is necessary.</para>
    128121
    129122    </sect3>

  • general.ent

    r6e13139 r26ae89a  
    1 <!ENTITY version         "20160101-systemd">
     1<!ENTITY version         "20160102-systemd">
    22<!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
    3 <!ENTITY releasedate     "January 1, 2016">
     3<!ENTITY releasedate     "January 2, 2016">
    44<!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
    55<!ENTITY milestone       "7.9">
Note: See TracChangeset for help on using the changeset viewer.