Changeset 03e6a40 for BOOK/temp-system/common/util-linux.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (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:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/temp-system/common/util-linux.xml (moved) (moved from BOOK/chroot/common/util-linux.xml ) (2 diffs)

BOOK/temp-system/common/util-linux.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-chroot-util-linux" role="wrap">
+<sect1 id="ch-temp-system-util-linux" role="wrap">
   <?dbhtml filename="util-linux.html"?>
 
   <title>Util-linux-&util-linux-version;</title>
 
-  <indexterm zone="ch-chroot-util-linux">
+  <indexterm zone="ch-temp-system-util-linux">
     <primary sortas="a-Util-linux">Util-linux</primary>
-    <secondary>chroot</secondary>
+    <secondary>temporary system</secondary>
   </indexterm>
 
@@ -29 +29 @@
 <screen os="b"><userinput>PKG_CONFIG= ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-makeinstall-chown --disable-su --disable-login</userinput></screen>
+    --disable-makeinstall-chown --disable-makeinstall-setuid</userinput></screen>
+
+    <variablelist os="c">
+      <title>The meaning of the new configure option:</title>
+
+      <varlistentry>
+        <term><parameter>--disable-makeinstall-chown</parameter></term>
+        <listitem>
+          <para>This prevents Util-linux from trying to perform any
+          chown commands when it is installed.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"