Changeset 5dcf5b3a

Timestamp:

Apr 26, 2014, 10:14:10 PM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

ad31767e

Parents:

9682e4d

Message:

Don't install find or psmisc binaries to /bin

Location:

BOOK

Files:

• final-system/common/findutils.xml (modified) (1 diff)
• final-system/common/psmisc.xml (modified) (1 diff)
• final-system/multilib/findutils.xml (modified) (1 diff)
• final-system/multilib/psmisc.xml (modified) (2 diffs)
• introduction/common/changelog.xml (modified) (1 diff)

BOOK/final-system/common/findutils.xml

@@ -58 +58 @@
 
 <screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">The <command>find</command> program is used by Systemd. As <filename
-    class="directory">/usr</filename> may not be available during the early
-    stages of booting, the <command>find</command> binary needs to be on
-    the root partition:</para>
-
-<screen os="j"><userinput>mv -v /usr/bin/find /bin</userinput></screen>
-
-    <para os="k">The <command>updatedb</command> script needs to be modified
-    to point to the new location for <command>find</command>:</para>
-
-<screen os="l"><userinput>sed -i 's@find:=${BINDIR}@find:=/bin@' /usr/bin/updatedb</userinput></screen>
 
   </sect2>

BOOK/final-system/common/psmisc.xml

@@ -28 +28 @@
     <para os="a">Prepare Psmisc for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --exec-prefix=""</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <variablelist os="c">
-      <title>The meaning of the configure option:</title>
+    <para os="c">Compile the package:</para>
 
-      <varlistentry>
-        <term><parameter>--exec-prefix=""</parameter></term>
-        <listitem>
-          <para>This ensures that the Psmisc binaries will install into
-          <filename class="directory">/bin</filename> instead of
-          <filename class="directory">/usr/bin</filename>. This is the
-          correct location according to the FHS, because some of the Psmisc
-          binaries are used by Systemd.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para os="d">Compile the package:</para>
+    <para os="e">This package does not come with a test suite.</para>
 
-<screen os="e"><userinput>make</userinput></screen>
+    <para os="f">Install the package:</para>
 
-    <para os="f">This package does not come with a test suite.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">There is no reason for the <command>pstree</command> and
-    <command>pstree.x11</command> programs to reside in <filename
-    class="directory">/bin</filename>. Therefore, move them to <filename
-    class="directory">/usr/bin</filename>:</para>
-
-<screen os="j"><userinput>mv -v /bin/pstree* /usr/bin</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/findutils.xml

@@ -66 +66 @@
     href="../common/findutils.xml"
     xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
 
   </sect2>

BOOK/final-system/multilib/psmisc.xml

@@ -26 +26 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --exec-prefix=""</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -49 +48 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 

BOOK/introduction/common/changelog.xml

@@ -55 +55 @@
           inside the temporary boot environment.</para>
         </listitem>
+        <listitem>
+          <para>[Chris] - Don't move binaries from Findutils or Psmisc to /bin,
+          as they're no longer needed there.</para>
+        </listitem>
       </itemizedlist>
     </listitem>