gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-07-10 06:14:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge lfs-svn, pt 1

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10402 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Krejzi 2013-12-21 11:53:07 +00:00
parent b1a51ac18a
commit 112db9db28
10 changed files with 71 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
chapter01/changelog.xml
View File

@ -35,6 +35,26 @@
</itemizedlist>
</listitem>
-->
<listitem>
<para>2013-12-13</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Fix kmod, procps-ng, zlib, readline, ncurses,
and xz methods of establishing correct symbolic links
for libraries.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to procps-ng-3.3.9. Fixes
<ulink url="&lfs-ticket-root;3439">#3439</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Install non-essential programs from
the xz package in /usr/bin. Fixes
<ulink url="&lfs-ticket-root;3445">#3445</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2013-12-10</para>
<itemizedlist>

24
chapter03/patches.xml
View File

@ -74,6 +74,14 @@
</listitem>
</varlistentry>
<varlistentry>
<term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
<para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
</listitem>
</varlistentry>
<varlistentry>
<term>Tar Manpage Patch - <token>&tar-manpage-patch-size;</token>:</term>
<listitem>
@ -82,22 +90,6 @@
</listitem>
</varlistentry>
<varlistentry>
<term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
<para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
</listitem>
</varlistentry>
<!--
<varlistentry>
<term>Texinfo Test Patch - <token>&texinfo-test-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&texinfo-test-patch;"/></para>
<para>MD5 sum: <literal>&texinfo-test-patch-md5;</literal></para>
</listitem>
</varlistentry>
-->
</variablelist>
<para>Total size of these patches: about <returnvalue/></para>

23
chapter06/kmod.xml
View File

@ -45,26 +45,17 @@
<screen><userinput remap="configure">./configure --prefix=/usr \
--bindir=/bin \
--with-rootlibdir=/lib \
--sysconfdir=/etc \
--disable-manpages \
--with-rootlibdir=/lib \
--with-xz \
--with-zlib</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
<varlistentry>
<term><parameter>--with-rootlibdir</parameter></term>
<listitem>
<para>This switch ensures that shared library is installed in
<filename class="directory">/lib</filename> instead of
<filename class="directory">/usr/lib</filename>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--with-*</parameter></term>
<term><parameter>--with-xz, --with-zlib</parameter></term>
<listitem>
<para>These options enable Kmod to handle compressed kernel modules.</para>
</listitem>
@ -79,6 +70,14 @@
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--with-rootlibdir=/lib</parameter></term>
<listitem>
<para>This option ensures different library related files are placed
in the correct directories.</para>
</listitem>
</varlistentry>
</variablelist>
<para>Compile the package:</para>
@ -96,7 +95,7 @@
<screen><userinput remap="install">make install
for target in depmod insmod lsmod modinfo modprobe rmmod; do
for target in depmod insmod modinfo modprobe rmmod; do
ln -sv ../bin/kmod /sbin/$target
done

2
chapter06/ncurses.xml
View File

@ -110,7 +110,7 @@
<para>Because the libraries have been moved, one symlink points to
a non-existent file. Recreate it:</para>
<screen><userinput remap="install">ln -sfv ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so</userinput></screen>
<screen><userinput remap="install">ln -sfv ../../lib/$(readlink /usr/lib/libncursesw.so) /usr/lib/libncursesw.so</userinput></screen>
<para>Many applications still expect the linker to be able to find
non-wide-character Ncurses libraries. Trick such applications into linking with

29
chapter06/procps.xml
View File

@ -47,19 +47,11 @@
--libdir=/usr/lib \
--docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
--disable-static \
--disable-skill \
--disable-kill</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
<varlistentry>
<term><parameter>--disable-skill</parameter></term>
<listitem>
<para>This switch disables the obsolete and unportable
skill and snice commands.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--disable-kill</parameter></term>
<listitem>
@ -85,11 +77,12 @@ make check</userinput></screen>
<screen><userinput remap="install">make install</userinput></screen>
<para>Finally, move the library to a location that can be found if
<para>Finally, move essential files to a location that can be found if
<filename class="directory">/usr</filename> is not mounted.</para>
<screen><userinput remap="install">mv -v /usr/lib/libprocps.so.* /lib
ln -sfv ../../lib/libprocps.so.1.1.2 /usr/lib/libprocps.so</userinput></screen>
<screen><userinput remap="install">mv -v /usr/bin/pidof /bin
mv -v /usr/lib/libprocps.so.* /lib
ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</userinput></screen>
</sect2>
@ -101,7 +94,7 @@ ln -sfv ../../lib/libprocps.so.1.1.2 /usr/lib/libprocps.so</userinput></screen>
<segtitle>Installed library</segtitle>
<seglistitem>
<seg>free, pgrep, pkill, pmap, ps, pwdx, slabtop,
<seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop,
sysctl, tload, top, uptime, vmstat, w, and, watch</seg>
<seg>libprocps.so</seg>
</seglistitem>
@ -133,6 +126,16 @@ ln -sfv ../../lib/libprocps.so.1.1.2 /usr/lib/libprocps.so</userinput></screen>
</listitem>
</varlistentry>
<varlistentry id="pidof">
<term><command>pidof</command></term>
<listitem>
<para>Looks up processes based on their name and other attributes</para>
<indexterm zone="ch-system-procps pidof">
<primary sortas="b-pidof">pidof</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="pkill">
<term><command>pkill</command></term>
<listitem>
@ -261,7 +264,7 @@ ln -sfv ../../lib/libprocps.so.1.1.2 /usr/lib/libprocps.so</userinput></screen>
</varlistentry>
<varlistentry id="libprocps">
<term><filename class="libraryfile">libproc</filename></term>
<term><filename class="libraryfile">libprocps</filename></term>
<listitem>
<para>Contains the functions used by most programs in this
package</para>

17
chapter06/readline.xml
View File

@ -55,7 +55,7 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
<para>Prepare Readline for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr --libdir=/lib</userinput></screen>
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
<para>Compile the package:</para>
@ -81,17 +81,12 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
<screen><userinput remap="install">make install</userinput></screen>
<para>Now move the static libraries to a more appropriate location:</para>
<para>Now move the dynamic libraries to a more appropriate location
and fix up some symbolic links:</para>
<screen><userinput remap="install">mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
<para>Next, remove the <filename class="extension">.so</filename> files in
<filename class="directory">/lib</filename> and relink them into <filename
class="directory">/usr/lib</filename>:</para>
<screen><userinput remap="install">rm -v /lib/lib{readline,history}.so
ln -sfv ../../lib/libreadline.so.6 /usr/lib/libreadline.so
ln -sfv ../../lib/libhistory.so.6 /usr/lib/libhistory.so</userinput></screen>
<screen><userinput remap="install">mv -v /usr/lib/lib{readline,history}.so.* /lib
ln -sfv ../../lib/$(readlink /usr/lib/libreadline.so) /usr/lib/libreadline.so
ln -sfv ../../lib/$(readlink /usr/lib/libhistory.so ) /usr/lib/libhistory.so</userinput></screen>
<para>If desired, install the documentation:</para>

6
chapter06/xz.xml
View File

@ -47,7 +47,6 @@
<para>Prepare Xz for compilation with:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
--bindir=/bin \
--docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
<para>Compile the package:</para>
@ -58,12 +57,13 @@
<screen><userinput remap="test">make check</userinput></screen>
<para>Install the package and make sure that all libraries are in the
<para>Install the package and make sure that all essential files are in the
correct directory:</para>
<screen><userinput remap="install">make install
mv -v /usr/bin/{unlzma,unxz,xzcat,lzma,xz} /bin
mv -v /usr/lib/liblzma.so.* /lib
ln -svf ../../lib/liblzma.so.&xz-version; /usr/lib/liblzma.so</userinput></screen>
ln -svf ../../lib/$(readlink /usr/lib/liblzma.so) /usr/lib/liblzma.so</userinput></screen>
</sect2>

2
chapter06/zlib.xml
View File

@ -63,7 +63,7 @@
<filename class="directory">/usr/lib</filename> will need to be recreated:</para>
<screen><userinput remap="install">mv -v /usr/lib/libz.so.* /lib
ln -sfv ../../lib/libz.so.&zlib-version; /usr/lib/libz.so</userinput></screen>
ln -sfv ../../lib/$(readlink /usr/lib/libz.so) /usr/lib/libz.so</userinput></screen>
</sect2>

4
general.ent
View File

@ -1,5 +1,5 @@
<!ENTITY version "SYTEMD-20131210">
<!ENTITY releasedate "December 10, 2013">
<!ENTITY version "SYTEMD-20131221">
<!ENTITY releasedate "December 21, 2013">
<!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.5">
<!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

6
packages.ent
View File

@ -507,10 +507,10 @@
<!ENTITY pkgconfig-ch6-du "31 MB">
<!ENTITY pkgconfig-ch6-sbu "0.4 SBU">
<!ENTITY procps-ng-version "3.3.8">
<!ENTITY procps-ng-size "544 KB">
<!ENTITY procps-ng-version "3.3.9">
<!ENTITY procps-ng-size "548 KB">
<!ENTITY procps-ng-url "http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
<!ENTITY procps-ng-md5 "aecbeeda2ab308f8d09dddcb4cb9a572">
<!ENTITY procps-ng-md5 "0980646fa25e0be58f7afb6b98f79d74">
<!ENTITY procps-ng-home "http://sourceforge.net/projects/procps-ng">
<!ENTITY procps-ng-ch6-du "13 MB">
<!ENTITY procps-ng-ch6-sbu "0.2 SBU">