Changeset c4dcfd8


Ignore:
Timestamp:
03/04/2016 06:32:57 AM (6 years ago)
Author:
DJ Lucas <dj@…>
Branches:
7.9-systemd, systemd
Children:
68c0a30, 7e0e3fa
Parents:
b0424f7
Message:

Merge recent changes from trunk.

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

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • chapter01/changelog.xml

    rb0424f7 rc4dcfd8  
    3737-->
    3838    <listitem>
     39      <para>2016-03-04</para>
     40      <itemizedlist>
     41        <listitem>
     42          <para>[dj] - Prevent attr and shadow from overwriting
     43          man pages installed by the man-pages package - Merged from
     44          trunk.</para>
     45        </listitem>
     46        <listitem>
     47          <para>[dj] - Retain flex static library for automake
     48          regression tests.  Remove at the end of Chapter 6 - Merged from
     49          trunk.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
     53
     54    <listitem>
    3955      <para>2016-02-19</para>
    4056      <itemizedlist>
  • chapter06/attr.xml

    rb0424f7 rc4dcfd8  
    5050    the <xref linkend="man-pages"/> package:</para>
    5151
    52 <screen><userinput remap="pre">sed -i -e "/SUBDIRS/s|man2||" man/Makefile</userinput></screen>
     52<screen><userinput remap="pre">sed -i -e "/SUBDIRS/s|man[25]||g" man/Makefile</userinput></screen>
    5353
    5454    <para>Prepare Attr for compilation:</para>
  • chapter06/flex.xml

    rb0424f7 rc4dcfd8  
    4444    <para>Prepare Flex for compilation:</para>
    4545
    46 <screen><userinput remap="configure">./configure --prefix=/usr    \
    47             --disable-static \
    48             --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
     46<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
    4947
    5048    <para>Compile the package:</para>
  • chapter06/revisedchroot.xml

    rb0424f7 rc4dcfd8  
    4444  <para>Finally, there were several static libraries that were not supressed earlier
    4545  in the chapter in order to satisfy the regression tests in several packages. These
    46   libraries are from binutils, bzip2, e2fsprogs, <!--flex,--> libtool, and zlib.  If desired,
     46  libraries are from binutils, bzip2, e2fsprogs, flex, libtool, and zlib.  If desired,
    4747  remove them now:</para>
    4848
     
    5151rm -f /usr/lib/lib{com_err,e2p,ext2fs,ss}.a
    5252rm -f /usr/lib/libltdl.a
     53rm -f /usr/lib/libfl.a
     54rm -f /usr/lib/libfl_pic.a
    5355rm -f /usr/lib/libz.a</userinput></screen>
    5456
    55 <!-- Flex shared library is broken. Keep static until next flex release. -->
    56 
    5757</sect1>
  • chapter06/shadow.xml

    rb0424f7 rc4dcfd8  
    5151
    5252    <para>Disable the installation of the <command>groups</command> program
    53     and its man pages, as Coreutils provides a better version:</para>
     53    and its man pages, as Coreutils provides a better version. Also
     54    Prevent the installation of manual pages that were already installed by the
     55    <xref linkend="man-pages"/> package:</para>
    5456
    5557<screen><userinput remap="pre">sed -i 's/groups$(EXEEXT) //' src/Makefile.in
    56 find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></screen>
     58find man -name Makefile.in -exec sed -i 's/groups\.1 / /'   {} \;
     59find man -name Makefile.in -exec sed -i 's/getspnam\.3 / /' {} \;
     60find man -name Makefile.in -exec sed -i 's/passwd\.5 / /'   {} \;</userinput></screen>
    5761
    5862    <para id="shadow-login_defs">Instead of using the default
  • general.ent

    rb0424f7 rc4dcfd8  
    1 <!ENTITY version         "20160219-systemd">
     1<!ENTITY version         "20160304-systemd">
    22<!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
    3 <!ENTITY releasedate     "February 19, 2016">
     3<!ENTITY releasedate     "March 04, 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.