Changeset cc09c07


Ignore:
Timestamp:
09/30/2018 01:14:36 AM (5 years ago)
Author:
DJ Lucas <dj@…>
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, 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/parallelism, xry111/pip3, xry111/rust-wip-20221008
Children:
a9a92e4
Parents:
6c67242
Message:

Restore build of Util-Linux in chapter5 to avoid reciprocal dependency for Systemd.
Moved installation of Util-Linux and E2fsprogs after Procps to satisfy build order in the Systemd book. This has no effect on the SysV book.

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

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    r6c67242 rcc09c07  
    4343    appropriate for the entry or if needed the entire day's listitem.
    4444-->
     45
     46    <listitem>
     47      <para>2018-09-30</para>
     48      <itemizedlist>
     49        <listitem revision="systemd">
     50          <para>[dj] - Restore build of Util-Linux in chapter5 to avoid
     51          reciprocal dependency for Systemd.</para>
     52        </listitem>
     53        <listitem>
     54          <para>[dj] - Moved installation of Util-Linux and E2fsprogs after
     55          Procps to satisfy build order in the Systemd book. This has no effect
     56          on the SysV book.</para>
     57        </listitem>
     58      </itemizedlist>
     59    </listitem>
    4560
    4661    <listitem>

  • chapter05/chapter05.xml

    r6c67242 rcc09c07  
    4444  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
    4545  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
    46 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>-->
     46  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
    4747  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
    4848  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stripping.xml"/>

  • chapter05/util-linux.xml

    r6c67242 rcc09c07  
    66]>
    77
    8 <sect1 id="ch-tools-util-linux" role="wrap">
     8<sect1 id="ch-tools-util-linux" role="wrap" revision="systemd">
    99  <?dbhtml filename="util-linux.html"?>
    1010

  • chapter06/chapter06.xml

    r6c67242 rcc09c07  
    7979  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
    8080  <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"/>
    8381  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
    8482  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
    … …  
    8987  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
    9088  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
    91   <!-- props needs libsystemd -->
     89
     90  <!-- these packages libsystemd on systemd builds -->
    9291  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
     92  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
     93  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
    9394
    9495  <!-- sysv only -->

  • chapter06/systemd.xml

    r6c67242 rcc09c07  
    4545<screen><userinput remap="pre">ln -sf /tools/bin/true /usr/bin/xsltproc</userinput></screen>
    4646
     47    <para>Because we have not yet installed the final version of Util-Linux,
     48    create links to the libraries in the approprite location:</para>
     49
     50<screen><userinput remap="pre">for file in /tools/lib64/lib{blkid,mount,uuid}*; do
     51    ln -sf $file /usr/lib/
     52done</userinput></screen>
     53
    4754    <para>Set up the man pages:</para>
    4855
    … …  
    6875cd       build
    6976
     77PKG_CONFIG_PATH="/usr/lib/pkgconfig:/tools/lib64/pkgconfig" \
    7078LANG=en_US.UTF-8                   \
    7179meson --prefix=/usr                \

  • general.ent

    r6c67242 rcc09c07  
    1 <!ENTITY version         "SVN-20180920">
     1<!ENTITY version         "SVN-20180930">
    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 "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
    55
    6 <!ENTITY versiond        "20180920-systemd">
     6<!ENTITY versiond        "20180930-systemd">
    77<!ENTITY short-versiond  "systemd">
    88<!ENTITY generic-versiond "systemd">
    99
    10 <!ENTITY releasedate     "September 20, 2018">
     10<!ENTITY releasedate     "September 30, 2018">
    1111
    1212<!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
Note: See TracChangeset for help on using the changeset viewer.