Changeset 112db9d


Ignore:
Timestamp:
12/21/2013 11:53:07 AM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
7.5-systemd, 7.6-systemd, 7.7-systemd, 7.8-systemd, 7.9-systemd
Children:
c158fe6
Parents:
b1a51ac1
Message:

merge lfs-svn, pt 1

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

Files:
10 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    rb1a51ac1 r112db9d  
    3636    </listitem>
    3737-->
     38    <listitem>
     39      <para>2013-12-13</para>
     40      <itemizedlist>
     41        <listitem>
     42          <para>[bdubbs] - Fix kmod, procps-ng, zlib, readline, ncurses,
     43          and xz methods of establishing correct symbolic links
     44          for libraries.</para>
     45        </listitem>
     46        <listitem>
     47          <para>[bdubbs] - Update to procps-ng-3.3.9. Fixes
     48          <ulink url="&lfs-ticket-root;3439">#3439</ulink>.</para>
     49        </listitem>
     50        <listitem>
     51          <para>[bdubbs] - Install non-essential programs from
     52          the xz package in /usr/bin.  Fixes
     53          <ulink url="&lfs-ticket-root;3445">#3445</ulink>.</para>
     54        </listitem>
     55      </itemizedlist>
     56    </listitem>
     57
    3858    <listitem>
    3959      <para>2013-12-10</para>

  • chapter03/patches.xml

    rb1a51ac1 r112db9d  
    7676
    7777    <varlistentry>
     78      <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
     79      <listitem>
     80        <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
     81        <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
     82      </listitem>
     83    </varlistentry>
     84
     85    <varlistentry>
    7886      <term>Tar Manpage Patch - <token>&tar-manpage-patch-size;</token>:</term>
    7987      <listitem>
    … …  
    8391    </varlistentry>
    8492
    85     <varlistentry>
    86       <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
    87       <listitem>
    88         <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
    89         <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
    90       </listitem>
    91     </varlistentry>
    92 <!--
    93     <varlistentry>
    94       <term>Texinfo Test Patch - <token>&texinfo-test-patch-size;</token>:</term>
    95       <listitem>
    96         <para>Download: <ulink url="&patches-root;&texinfo-test-patch;"/></para>
    97         <para>MD5 sum: <literal>&texinfo-test-patch-md5;</literal></para>
    98       </listitem>
    99     </varlistentry>
    100 -->
    10193  </variablelist>
    10294

  • chapter06/kmod.xml

    rb1a51ac1 r112db9d  
    4646<screen><userinput remap="configure">./configure --prefix=/usr          \
    4747            --bindir=/bin          \
    48             --with-rootlibdir=/lib \
    4948            --sysconfdir=/etc      \
    5049            --disable-manpages     \
     50            --with-rootlibdir=/lib \
    5151            --with-xz              \
    5252            --with-zlib</userinput></screen>
    … …  
    5555      <title>The meaning of the configure options:</title>
    5656
    57        <varlistentry>
    58         <term><parameter>--with-rootlibdir</parameter></term>
    59         <listitem>
    60           <para>This switch ensures that shared library is installed in
    61           <filename class="directory">/lib</filename> instead of
    62           <filename class="directory">/usr/lib</filename>.</para>
    63         </listitem>
    64       </varlistentry>
    65 
    6657      <varlistentry>
    67         <term><parameter>--with-*</parameter></term>
     58        <term><parameter>--with-xz, --with-zlib</parameter></term>
    6859        <listitem>
    6960          <para>These options enable Kmod to handle compressed kernel modules.</para>
    … …  
    7768          rely on libxslt, which isn't available in the chroot
    7869          environment.</para>
     70        </listitem>
     71      </varlistentry>
     72
     73      <varlistentry>
     74        <term><parameter>--with-rootlibdir=/lib</parameter></term>
     75        <listitem>
     76          <para>This option ensures different library related files are placed
     77          in the correct directories.</para>
    7978        </listitem>
    8079      </varlistentry>
    … …  
    9796<screen><userinput remap="install">make install
    9897
    99 for target in depmod insmod lsmod modinfo modprobe rmmod; do
     98for target in depmod insmod modinfo modprobe rmmod; do
    10099  ln -sv ../bin/kmod /sbin/$target
    101100done

  • chapter06/ncurses.xml

    rb1a51ac1 r112db9d  
    111111    a non-existent file. Recreate it:</para>
    112112
    113 <screen><userinput remap="install">ln -sfv ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so</userinput></screen>
     113<screen><userinput remap="install">ln -sfv ../../lib/$(readlink /usr/lib/libncursesw.so) /usr/lib/libncursesw.so</userinput></screen>
    114114
    115115    <para>Many applications still expect the linker to be able to find

  • chapter06/procps.xml

    rb1a51ac1 r112db9d  
    4848            --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
    4949            --disable-static                        \
    50             --disable-skill                         \
    5150            --disable-kill</userinput></screen>
    5251
    … …  
    5453      <title>The meaning of the configure options:</title>
    5554
    56       <varlistentry>
    57         <term><parameter>--disable-skill</parameter></term>
    58         <listitem>
    59           <para>This switch disables the obsolete and unportable
    60           skill and snice commands.</para>
    61         </listitem>
    62       </varlistentry>
    6355      <varlistentry>
    6456        <term><parameter>--disable-kill</parameter></term>
    … …  
    8678<screen><userinput remap="install">make install</userinput></screen>
    8779
    88 <para>Finally, move the library to a location that can be found if
     80<para>Finally, move essential files to a location that can be found if
    8981<filename class="directory">/usr</filename> is not mounted.</para>
    9082
    91 <screen><userinput remap="install">mv -v /usr/lib/libprocps.so.* /lib
    92 ln -sfv ../../lib/libprocps.so.1.1.2 /usr/lib/libprocps.so</userinput></screen>
     83<screen><userinput remap="install">mv -v /usr/bin/pidof /bin
     84mv -v /usr/lib/libprocps.so.* /lib
     85ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</userinput></screen>
    9386
    9487  </sect2>
    … …  
    10295
    10396      <seglistitem>
    104         <seg>free, pgrep, pkill, pmap, ps, pwdx, slabtop,
     97        <seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop,
    10598        sysctl, tload, top, uptime, vmstat, w, and, watch</seg>
    10699        <seg>libprocps.so</seg>
    … …  
    130123          <indexterm zone="ch-system-procps pgrep">
    131124            <primary sortas="b-pgrep">pgrep</primary>
     125          </indexterm>
     126        </listitem>
     127      </varlistentry>
     128
     129      <varlistentry id="pidof">
     130        <term><command>pidof</command></term>
     131        <listitem>
     132          <para>Looks up processes based on their name and other attributes</para>
     133          <indexterm zone="ch-system-procps pidof">
     134            <primary sortas="b-pidof">pidof</primary>
    132135          </indexterm>
    133136        </listitem>
    … …  
    262265
    263266      <varlistentry id="libprocps">
    264         <term><filename class="libraryfile">libproc</filename></term>
     267        <term><filename class="libraryfile">libprocps</filename></term>
    265268        <listitem>
    266269          <para>Contains the functions used by most programs in this

  • chapter06/readline.xml

    rb1a51ac1 r112db9d  
    5656    <para>Prepare Readline for compilation:</para>
    5757
    58 <screen><userinput remap="configure">./configure --prefix=/usr --libdir=/lib</userinput></screen>
     58<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
    5959
    6060    <para>Compile the package:</para>
    … …  
    8282<screen><userinput remap="install">make install</userinput></screen>
    8383
    84     <para>Now move the static libraries to a more appropriate location:</para>
     84    <para>Now move the dynamic libraries to a more appropriate location
     85    and fix up some symbolic links:</para>
    8586
    86 <screen><userinput remap="install">mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
    87 
    88     <para>Next, remove the <filename class="extension">.so</filename> files in
    89     <filename class="directory">/lib</filename> and relink them into <filename
    90     class="directory">/usr/lib</filename>:</para>
    91 
    92 <screen><userinput remap="install">rm -v /lib/lib{readline,history}.so
    93 ln -sfv ../../lib/libreadline.so.6 /usr/lib/libreadline.so
    94 ln -sfv ../../lib/libhistory.so.6 /usr/lib/libhistory.so</userinput></screen>
     87<screen><userinput remap="install">mv -v /usr/lib/lib{readline,history}.so.* /lib
     88ln -sfv ../../lib/$(readlink /usr/lib/libreadline.so) /usr/lib/libreadline.so
     89ln -sfv ../../lib/$(readlink /usr/lib/libhistory.so ) /usr/lib/libhistory.so</userinput></screen>
    9590
    9691    <para>If desired, install the documentation:</para>

  • chapter06/xz.xml

    rb1a51ac1 r112db9d  
    4848
    4949<screen><userinput remap="configure">./configure --prefix=/usr \
    50             --bindir=/bin \
    5150            --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
    5251
    … …  
    5958<screen><userinput remap="test">make check</userinput></screen>
    6059
    61   <para>Install the package and make sure that all libraries are in the
     60  <para>Install the package and make sure that all essential files are in the
    6261  correct directory:</para>
    6362
    6463<screen><userinput remap="install">make install
     64mv -v   /usr/bin/{unlzma,unxz,xzcat,lzma,xz} /bin
    6565mv -v /usr/lib/liblzma.so.* /lib
    66 ln -svf ../../lib/liblzma.so.&xz-version; /usr/lib/liblzma.so</userinput></screen>
     66ln -svf ../../lib/$(readlink /usr/lib/liblzma.so) /usr/lib/liblzma.so</userinput></screen>
    6767
    6868  </sect2>

  • chapter06/zlib.xml

    rb1a51ac1 r112db9d  
    6464
    6565<screen><userinput remap="install">mv -v /usr/lib/libz.so.* /lib
    66 ln -sfv ../../lib/libz.so.&zlib-version; /usr/lib/libz.so</userinput></screen>
     66ln -sfv ../../lib/$(readlink /usr/lib/libz.so) /usr/lib/libz.so</userinput></screen>
    6767
    6868  </sect2>

  • general.ent

    rb1a51ac1 r112db9d  
    1 <!ENTITY version         "SYTEMD-20131210">
    2 <!ENTITY releasedate     "December 10, 2013">
     1<!ENTITY version         "SYTEMD-20131221">
     2<!ENTITY releasedate     "December 21, 2013">
    33<!ENTITY copyrightdate   "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
    44<!ENTITY milestone       "7.5">

  • packages.ent

    rb1a51ac1 r112db9d  
    508508<!ENTITY pkgconfig-ch6-sbu "0.4 SBU">
    509509
    510 <!ENTITY procps-ng-version "3.3.8">
    511 <!ENTITY procps-ng-size "544 KB">
     510<!ENTITY procps-ng-version "3.3.9">
     511<!ENTITY procps-ng-size "548 KB">
    512512<!ENTITY procps-ng-url "http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
    513 <!ENTITY procps-ng-md5 "aecbeeda2ab308f8d09dddcb4cb9a572">
     513<!ENTITY procps-ng-md5 "0980646fa25e0be58f7afb6b98f79d74">
    514514<!ENTITY procps-ng-home "http://sourceforge.net/projects/procps-ng">
    515515<!ENTITY procps-ng-ch6-du "13 MB">
Note: See TracChangeset for help on using the changeset viewer.