Changeset 3f2219e for BOOK/boot

Timestamp:

Apr 14, 2014, 2:18:31 PM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

0d68a5c

Parents:

4b9dcd7

Message:

Consolidated sysvinit source code changes into a patch

Location:

BOOK/boot

Files:

• common/sysvinit.xml (modified) (1 diff)
• multilib/sysvinit.xml (modified) (1 diff)

BOOK/boot/common/sysvinit.xml

@@ -27 +27 @@
     <title>Installation of Sysvinit</title>
 
-    <para os="s1">Prevent several programs from being built, as better versions
-    were already installed by Util-linux:</para>
-
-<screen os="s2"><userinput>cp -v src/Makefile{,.orig}
-sed -e 's/\ sulogin[^ ]*//' -e '/utmpdump/d' -e '/mountpoint/d' \
-    -e '/mesg/d' src/Makefile.orig &gt; src/Makefile</userinput></screen>
-
-    <para os="aa">The following modifications help locate files specific to this
-    particular build:</para>
-
-<screen os="ab"><userinput>cp -v src/Makefile{,.orig}
-sed -e 's,/usr/lib,/tools/lib,g' \
-    src/Makefile.orig > src/Makefile</userinput></screen>
-
-    <para os="bc">Change the location of inittab:</para>
-
-<screen os="bd"><userinput>cp -v src/paths.h{,.orig}
-sed 's@/etc/inittab@/tools&amp;@' src/paths.h.orig &gt; src/paths.h</userinput></screen>
+    <para os="p1">Apply a patch to prevent installation of unneeded programs,
+    and allow Sysvinit to be installed in
+    <filename class="directory">/tools</filename>:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../sysvinit-&sysvinit-version;-tools_updates-1.patch</userinput></screen>
 
     <para os ="c">Compile the package:</para>

BOOK/boot/multilib/sysvinit.xml

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='bc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"