Changeset 4ea67ff

Timestamp:

12/07/2013 10:36:41 PM (10 years ago)

Author:

Bruce Dubbs <bdubbs@…>

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, 7.5, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 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:

f6b1d91

Parents:

1d8c944

Message:

Fix location of binaries and libraries for kmod and xz.

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

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter06/kmod.xml (modified) (3 diffs)
• chapter06/xz.xml (modified) (2 diffs)
• general.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -37 +37 @@
 -->
     <listitem>
+      <para>2013-12-07</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Fix location of binaries and libraries 
+          for kmod and xz.  Fixes
+          <ulink url="&lfs-ticket-root;3443">#3443</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2013-11-23</para>
       <itemizedlist>

chapter06/kmod.xml

@@ -46 +46 @@
 <screen><userinput remap="configure">./configure --prefix=/usr       \
             --bindir=/bin       \
-            --libdir=/lib       \
             --sysconfdir=/etc   \
             --disable-manpages  \
@@ -82 +81 @@
 
     <para>Install the package, and create symlinks for compatibility with
-    Module-Init-Tools, the package that previously handled Linux kernel modules:
+    Module-Init-Tools, the package that previously handled Linux kernel modules.
+    Also make sure that all libraries are in the correct directory:
     </para>
 
-<screen><userinput remap="install">make pkgconfigdir=/usr/lib/pkgconfig install
+<screen><userinput remap="install">make install
 
 for target in depmod insmod modinfo modprobe rmmod; do
@@ -92 +92 @@
 
 ln -sv kmod /bin/lsmod</userinput></screen>
+
+    <para> Make sure that all libraries are in the correct directory: </para>
+
+<screen><userinput remap="install">mv -v /usr/lib/libkmod.so.* /lib
+ln -svf ../../lib/libkmod.so.2.2.4 /usr/lib/libkmod.so</userinput></screen>
+
+<!-- Note to editors:  When upgrading kmod, make sure the library version
+     specified above has not changed -->
 
   </sect2>

chapter06/xz.xml

@@ -47 +47 @@
     <para>Prepare Xz for compilation with:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --libdir=/lib --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr \
+            --bindir=/bin \
+            --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <para>Compile the package:</para>
@@ -57 +59 @@
 <screen><userinput remap="test">make check</userinput></screen>
 
-  <para>Install the package:</para>
-
-<screen><userinput remap="install">make pkgconfigdir=/usr/lib/pkgconfig install</userinput></screen>
+  <para>Install the package and make sure that all libraries are in the
+  correct directory:</para>
+
+<screen><userinput remap="install">make install
+mv -v /usr/lib/liblzma.so.* /lib
+ln -svf ../../lib/liblzma.so.&xz-version; /usr/lib/liblzma.so</userinput></screen>
 
   </sect2>

general.ent

@@ -1 @@
-<!ENTITY version         "SVN-20131123">
-<!ENTITY releasedate     "November 23, 2013">
+<!ENTITY version         "SVN-20131207">
+<!ENTITY releasedate     "December 7, 2013">
 <!ENTITY copyrightdate   "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.5">