Changeset 6dfcfecc for chapter08/util-linux.xml

Timestamp:

03/31/2021 10:41:39 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

7610848

Parents:

811b5a39

git-author:

Thomas Trepl <thomas@…> (06/29/2020 07:55:01 AM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:39 AM)

Message:

Update to new lfs structure

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11986 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter08/util-linux.xml (moved) (moved from chapter06/util-linux.xml ) (10 diffs)

chapter08/util-linux.xml

@@ -33 +33 @@
 
       <seglistitem>
-        <seg>&util-linux-ch6-sbu;</seg>
-        <seg>&util-linux-ch6-du;</seg>
+        <seg>&util-linux-fin-sbu;</seg>
+        <seg>&util-linux-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
@@ -50 +50 @@
 
 <screen><userinput remap="pre">mkdir -pv /var/lib/hwclock</userinput></screen>
-
-    <para>Remove the earlier created symlinks and files:</para>
-
-<screen><userinput remap="pre">rm -vf /usr/include/{blkid,libfdisk,libmount,uuid}
-rm -vf /usr/lib/lib{blkid,fdisk,mount,uuid}.so*
-rm -vf /usr/lib/pkgconfig/{blkid,fdisk,mount,uuid}.pc</userinput></screen>
 
     <para>Prepare Util-linux for compilation:</para>
@@ -97 +91 @@
     <warning><para>Running the test suite as the root user can be harmful to
     your system.  To run it, the CONFIG_SCSI_DEBUG option for the kernel must
-    be available in the currently running system, and must be built as a
+    be available in the currently running system and must be built as a
     module.  Building it into the kernel will prevent booting.  For complete
     coverage, other BLFS packages must be installed.  If desired, this test can
@@ -114 +108 @@
   </sect2>
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - 32bit  -->
+  <!-- - - - - - - - - - -->
   
   <sect2 arch="ml_32,ml_all" role="installation">
@@ -138 +134 @@
             --without-python         \
             --without-systemd        \
-            --libdir=/usr/lib32      \
+            --libdir=&usr-lib-m32;      \
             --host=i686-pc-linux-gnu \
             --without-systemdsystemunitdir \
@@ -155 +151 @@
             --disable-static         \
             --without-python         \
-            --libdir=/usr/lib32      \
+            --libdir=&usr-lib-m32;      \
             --host=i686-pc-linux-gnu \
             --enable-libmount-force-mountinfo</userinput></screen>
@@ -166 +162 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR/usr/lib32/* /usr/lib32
+cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
 rm -rf DESTDIR</userinput></screen>
 
-  </sect2>
-
-  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  </sect2><!-- m32 -->
+
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - x32bit -->
+  <!-- - - - - - - - - - -->
   
   <sect2 arch="ml_x32,ml_all" role="installation">
@@ -196 +194 @@
             --without-systemd    \
             --without-systemdsystemunitdir \
-            --libdir=/usr/libx32  \
+            --libdir=&usr-lib-mx32; \
             --host=x86_64-pc-linux-gnux32 \
             --enable-libmount-force-mountinfo</userinput></screen>
@@ -212 +210 @@
             --disable-static     \
             --without-python     \
-            --libdir=/usr/libx32 \
+            --libdir=&usr-lib-mx32; \
             --host=x86_64-pc-linux-gnux32 \
             --enable-libmount-force-mountinfo</userinput></screen>
@@ -223 +221 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR/usr/libx32/* /usr/libx32
+cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
 rm -rf DESTDIR</userinput></screen>
 
-  </sect2>
+  </sect2><!-- mx32 -->
 
   <sect2 id="contents-utillinux" role="content">