Changeset 98c59fa for BOOK/final-system/common

Timestamp:

Jul 18, 2009, 4:41:58 PM (15 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

2f9a05f1

Parents:

bbb7784

Message:

use the libblkid and libuuid provided by Util-Linux-NG instead of E2fsprogs now.

Location:

BOOK/final-system/common

Files:

• e2fsprogs.xml (modified) (5 diffs)
• util-linux-ng.xml (modified) (4 diffs)

BOOK/final-system/common/e2fsprogs.xml

@@ -37 +37 @@
     <para os="c">Prepare E2fsprogs for compilation:</para>
 
-<screen os="d"><userinput>../configure --prefix=/usr --with-root-prefix="" \
-    --enable-elf-shlibs --with-cc=gcc</userinput></screen>
+<screen os="d"><userinput>PKG_CONFIG=true ../configure --prefix=/usr --with-root-prefix="" \
+    --enable-elf-shlibs --with-cc=gcc \
+    --disable-libuuid --disable-libblkid</userinput></screen>
 
     <variablelist os="e">
@@ -69 +70 @@
     <para os="f">Compile the package:</para>
 
-<screen os="g"><userinput>make</userinput></screen>
+<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
+    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"</userinput></screen>
 
     <para os="h">To test the results, issue:
@@ -97 +99 @@
         mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev mklost+found, resize2fs,
         tune2fs, uuidd, and uuidgen.</seg>
-        <seg>libblkid.[a,so], libcom_err.[a,so], libe2p.[a,so],
-        libext2fs.[a,so], libss.[a,so], and libuuid.[a,so]</seg>
+        <seg>libcom_err.[a,so], libe2p.[a,so], libext2fs.[a,so], and
+        libss.[a,so]</seg>
       </seglistitem>
     </segmentedlist>
@@ -448 +450 @@
       </varlistentry>
 
-      <varlistentry id="libblkid">
-        <term><filename class="libraryfile">libblkid</filename></term>
-        <listitem>
-          <para>Contains routines for device identification and token
-          extraction</para>
-          <indexterm zone="ch-system-e2fsprogs libblkid">
-            <primary sortas="c-libblkid">libblkid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libcom_err">
         <term><filename class="libraryfile">libcom_err</filename></term>
@@ -501 +492 @@
       </varlistentry>
 
-      <varlistentry id="libuuid">
-        <term><filename class="libraryfile">libuuid</filename></term>
-        <listitem>
-          <para>Contains routines for generating unique identifiers for objects
-          that may be accessible beyond the local system</para>
-          <indexterm zone="ch-system-e2fsprogs libuuid">
-            <primary sortas="c-libuuid">libuuid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 

BOOK/final-system/common/util-linux-ng.xml

@@ -22 +22 @@
     and messages.</para>
 
-
   </sect2>
 
@@ -108 +107 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
 
       <seglistitem>
@@ -119 +119 @@
         sfdisk, swapoff (link to swapon), swapon, tailf, taskset, tunelp, ul,
         umount, whereis, and write</seg>
+        <seg>libblkid.[a,so] and libuuid.[a,so]</seg>
       </seglistitem>
     </segmentedlist>
@@ -833 +834 @@
       </varlistentry>
 
+      <varlistentry id="libblkid">
+        <term><filename class="libraryfile">libblkid</filename></term>
+        <listitem>
+          <para>Contains routines for device identification and token
+          extraction</para>
+          <indexterm zone="ch-system-util-linux-ng libblkid">
+            <primary sortas="c-libblkid">libblkid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libuuid">
+        <term><filename class="libraryfile">libuuid</filename></term>
+        <listitem>
+          <para>Contains routines for generating unique identifiers for objects
+          that may be accessible beyond the local system</para>
+          <indexterm zone="ch-system-util-linux-ng libuuid">
+            <primary sortas="c-libuuid">libuuid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>