Changeset 161691d

Timestamp:

01/04/2020 09:00:15 AM (4 years ago)

Author:

Pierre Labastie <pieere@…>

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, 12.1, 12.1-rc1, 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/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

7e42b39

Parents:

96ef299

Message:

Fix various issues in libcap-2.29

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

Files:

• appendices/dependencies.xml (modified) (1 diff)
• chapter01/changelog.xml (modified) (1 diff)
• chapter06/libcap.xml (modified) (4 diffs)
• chapter06/systemd.xml (modified) (1 diff)
• general.ent (modified) (1 diff)

appendices/dependencies.xml

@@ -404 +404 @@
 
         <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>

chapter01/changelog.xml

@@ -44 +44 @@
        -->
     <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>

chapter06/libcap.xml

@@ -44 +44 @@
     <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>
@@ -56 +60 @@
     <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>
@@ -63 +67 @@
 
       <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>
@@ -82 +77 @@
  
     </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>

chapter06/systemd.xml

@@ -52 +52 @@
 
     <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

general.ent

@@ -1 @@
-<!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; -->