Changeset 3b0c31e

Timestamp:

Jan 8, 2011, 8:01:38 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

bc1efc44

Parents:

bd6ae4f

Message:

Updated Sysvinit to 2.88dsf.

Files:

• BOOK/boot/common/sysvinit.xml (modified) (2 diffs)
• BOOK/final-system/common/sysvinit.xml (modified) (1 diff)
• BOOK/final-system/multilib/sysvinit.xml (modified) (1 diff)
• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/materials/common/patches.xml (modified) (1 diff)
• BOOK/packages.ent (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/sysvinit-2.86-fixes-1.patch (deleted)

BOOK/boot/common/sysvinit.xml

@@ -23 +23 @@
     <title>Installation of Sysvinit</title>
 
-    <para os="aa">Make some modifications to allow you to boot into
-    the minimal temp-system:</para>
+    <para os="aa">The following modifications help locate files specific to this
+    perticular build:</para>
 
-<screen os="ab"><userinput>cp -v src/Makefile src/Makefile.orig
-sed -e 's@root@0@g' \
-    -e "s@/dev/initctl@${CLFS}&amp;@g" \
-    -e 's@\(mknod \)-m \([0-9]* \)\(.* \)p@\1\3p; chmod \2\3@g' \
-    -e "s@/usr/lib@/tools/lib@" \
-    src/Makefile.orig &gt; src/Makefile</userinput></screen>
+<screen os="ab"><userinput>cp -v src/Makefile{,.orig}
+sed -e 's,/usr/lib,/tools/lib,g' \
+    src/Makefile.orig > src/Makefile</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -44 +41 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="ad"><userinput>make -C src install INSTALL=install ROOT=${CLFS}</userinput></screen>
+<screen os="ad"><userinput>make -C src ROOT=${CLFS} install</userinput></screen>
 
   </sect2>

BOOK/final-system/common/sysvinit.xml

@@ -24 +24 @@
   <sect2 role="installation">
     <title>Installation of Sysvinit</title>
-
-    <para os="p1">The following patch contains a number of updates to Sysvinit
-    &sysvinit-version;:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&sysvinit-fixes-patch;</userinput></screen>
 
     <para os="c">Compile the package:</para>

BOOK/final-system/multilib/sysvinit.xml

@@ -20 +20 @@
   <sect2 role="installation">
     <title>Installation of Sysvinit</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/introduction/common/changelog.xml

@@ -41 +41 @@
       <para>January 8, 2011</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated Sysvinit to 2.88dsf.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated DHCPCD to 5.2.10.</para>

BOOK/materials/common/patches.xml

@@ -128 +128 @@
 
     <varlistentry>
-      <term>Sysvinit Fixes Patch - <token>&sysvinit-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&sysvinit-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&sysvinit-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Tar Man Page Patch - <token>&tar-man-patch-size;</token>:</term>
       <listitem>

BOOK/packages.ent

@@ -377 +377 @@
 <!ENTITY silo-home "">
 
-<!ENTITY sysvinit-version "2.86">
-<!ENTITY sysvinit-size "96 KB">
-<!ENTITY sysvinit-url "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-&sysvinit-version;.tar.gz">
+<!ENTITY sysvinit-version "2.88dsf">
+<!ENTITY sysvinit-size "104 KB">
+<!ENTITY sysvinit-url "http://download.savannah.gnu.org/releases/sysvinit/sysvinit-&sysvinit-version;.tar.gz">
 <!ENTITY sysvinit-md5 "7d5d61c026122ab791ac04c8a84db967">
-<!ENTITY sysvinit-home " ">
+<!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
 
 <!ENTITY tar-version "1.25">

BOOK/patches.ent

@@ -56 +56 @@
 <!ENTITY readline-branch_update-patch-md5 "91bb18428fcacb91b3f4c09d219e1258">
 <!ENTITY readline-branch_update-patch-size "4 KB">
-
-<!ENTITY sysvinit-fixes-patch "sysvinit-&sysvinit-version;-fixes-1.patch">
-<!ENTITY sysvinit-fixes-patch-md5 "405d23896b54ca61afd53003a62592fd">
-<!ENTITY sysvinit-fixes-patch-size "20 KB">
 
 <!ENTITY tar-man-patch "tar-&tar-version;-man-1.patch">