Changeset 026bb5d for BOOK/boot/multilib/util-linux.xml

Timestamp:

Dec 18, 2013, 1:04:00 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Updated simp branch to match main book

File:

• BOOK/boot/multilib/util-linux.xml (modified) (2 diffs)

BOOK/boot/multilib/util-linux.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of Util-linux</title>
-
+    
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
-  ./configure \
-    --prefix=/tools --exec-prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64 --enable-login-utils \
-    --disable-makeinstall-chown</userinput></screen>
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure \
+    --prefix=/tools --exec-prefix="" --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} --libdir=/tools/lib64 --bindir=/tools/bin \
+    --sbindir=/tools/sbin --disable-makeinstall-chown --disable-login \
+    --disable-su</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -46 +45 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+<screen os="h"><userinput>make usrsbin_execdir=/tools/sbin usrbin_execdir=/tools/bin install</userinput></screen>
 
   </sect2>