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

Fix various issues in libcap-2.29

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11719 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Pierre Labastie 2020-01-04 09:00:15 +00:00
parent 96ef2990d2
commit 161691d721
5 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appendices/dependencies.xml
View File

@ -403,8 +403,8 @@
<segtitle>&dependencies;</segtitle>
<seglistitem>
<seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Make,
Patch, Perl, Sed, and Texinfo</seg>
<seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Libcap,
Make, Patch, Perl, Sed, and Texinfo</seg>
</seglistitem>
</segmentedlist>

10
chapter01/changelog.xml
View File

@ -42,6 +42,16 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
<para>2020-01-04</para>
<itemizedlist>
<listitem>
<para>[pierre] - Fix various issues in libcap-2.29, and
update dependencies.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2020-01-01</para>
<itemizedlist>

35
chapter06/libcap.xml
View File

@ -43,53 +43,40 @@
<sect2 role="installation">
<title>Installation of Libcap</title>
<para>Prevent a static library from being installed:</para>
<para>Prevent two static libraries from being installed:</para>
<screen><userinput remap="pre">sed -i '/install.*STALIBNAME/d' libcap/Makefile</userinput></screen>
<screen><userinput remap="pre">sed -i '/install.*STA...LIBNAME/d' libcap/Makefile</userinput></screen>
<para>Fix a file with wrong syntax:</para>
<screen><userinput remap="pre">sed -i '/libpsx/,$d' libcap/libcap.pc.in</userinput></screen>
<para>Compile the package:</para>
<screen><userinput remap="make">make</userinput></screen>
<screen><userinput remap="make">make lib=lib</userinput></screen>
<para>This package does not come with a test suite.</para>
<para>Install the package:</para>
<screen><userinput remap="install">make RAISE_SETFCAP=no lib=lib prefix=/usr install
chmod -v 755 /usr/lib/libcap.so.&libcap-version;</userinput></screen>
<screen><userinput remap="install">make lib=lib install
chmod -v 755 /lib/libcap.so.&libcap-version;</userinput></screen>
<variablelist>
<title>The meaning of the make option:</title>
<varlistentry>
<term><parameter>RAISE_SETFCAP=no</parameter></term>
<listitem>
<para>This parameter skips trying to use <command>setcap</command>
on itself. This avoids an installation error if the kernel or file
system does not support extended capabilities.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>lib=lib</parameter></term>
<listitem>
<para>This parameter installs the library in
<filename>$prefix/lib</filename> rather than
<filename>$prefix/lib64</filename> on x86_64. It has no effect on
<filename>/lib</filename> rather than
<filename>/lib64</filename> on x86_64. It has no effect on
x86.</para>
</listitem>
</varlistentry>
</variablelist>
<para>The shared library needs to be moved to
<filename class="directory">/lib</filename>, and as a result the
<filename class="extension">.so</filename> file in
<filename class="directory">/usr/lib</filename> will need to be recreated:</para>
<screen><userinput remap="install">mv -v /usr/lib/libcap.so.* /lib
ln -sfv ../../lib/$(readlink /usr/lib/libcap.so) /usr/lib/libcap.so</userinput></screen>
</sect2>
<sect2 id="contents-libcap" role="content">

2
chapter06/systemd.xml
View File

@ -51,7 +51,7 @@
<screen><userinput remap="pre">ln -sf /tools/bin/true /usr/bin/xsltproc</userinput></screen>
<para>Because we have not yet installed the final version of Util-Linux,
create links to the libraries in the approprite location:</para>
create links to the libraries in the appropriate location:</para>
<screen><userinput remap="pre">for file in /tools/lib/lib{blkid,mount,uuid}.so*; do
ln -sf $file /usr/lib/

6
general.ent
View File

@ -1,13 +1,13 @@
<!ENTITY version "SVN-20200101">
<!ENTITY version "SVN-20200104">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
<!ENTITY versiond "20200101-systemd">
<!ENTITY versiond "20200104-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
<!ENTITY releasedate "January 1st, 2020">
<!ENTITY releasedate "January 4th, 2020">
<!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "9.0">