Changeset 80a3b8a

Timestamp:

Apr 26, 2014, 1:12:36 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

5e9c6cb

Parents:

4f3d4d5

Message:

Rename bootscripts to boot-scripts and use a new package that doesn't need patching

Location:

BOOK

Files:

• appendices/dependencies/common.xml (modified) (1 diff)
• appendices/rationale/common.xml (modified) (1 diff)
• boot/alpha-chapter.xml (modified) (1 diff)
• boot/common/bootscripts.xml (deleted)
• boot/mips-chapter.xml (modified) (1 diff)
• boot/mips64-64-chapter.xml (modified) (1 diff)
• boot/mips64-chapter.xml (modified) (1 diff)
• boot/ppc-chapter.xml (modified) (1 diff)
• boot/ppc64-64-chapter.xml (modified) (1 diff)
• boot/ppc64-chapter.xml (modified) (1 diff)
• boot/sparc-chapter.xml (modified) (1 diff)
• boot/sparc/silo.xml (modified) (1 diff)
• boot/sparc64-64-chapter.xml (modified) (1 diff)
• boot/sparc64-chapter.xml (modified) (1 diff)
• boot/x86-chapter.xml (modified) (1 diff)
• boot/x86_64-64-chapter.xml (modified) (1 diff)
• boot/x86_64-chapter.xml (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)
• materials/common/packages.xml (modified) (1 diff)
• materials/common/patches.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• patches.ent (modified) (1 diff)

BOOK/appendices/dependencies/common.xml

@@ -283 +283 @@
       </segmentedlist>
 
-<!-- Begin CLFS-Bootscripts dependency info -->
-  <bridgehead renderas="sect2" id="bootscripts-dep">CLFS-Bootscripts</bridgehead>
+<!-- Begin CLFS-Boot-scripts dependency info -->
+  <bridgehead renderas="sect2" id="boot-scripts-dep">CLFS-Boot-scripts</bridgehead>
 
       <segmentedlist>

BOOK/appendices/rationale/common.xml

@@ -79 +79 @@
 
     <listitem>
-      <para>CLFS-Bootscripts</para>
+      <para>CLFS-Boot-scripts</para>
       <para>This package contains a number of scripts that run at boottime,
       performing essential tasks such as mounting/checking filesystems and

BOOK/boot/alpha-chapter.xml

@@ -13 +13 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>

BOOK/boot/mips-chapter.xml

@@ -13 +13 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>

BOOK/boot/mips64-64-chapter.xml

@@ -13 +13 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>

BOOK/boot/mips64-chapter.xml

@@ -13 +13 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>

BOOK/boot/ppc-chapter.xml

@@ -13 +13 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>

BOOK/boot/ppc64-64-chapter.xml

@@ -13 +13 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>

BOOK/boot/ppc64-chapter.xml

@@ -13 +13 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs-libs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs.xml"/>

BOOK/boot/sparc-chapter.xml

@@ -13 +13 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>

BOOK/boot/sparc/silo.xml

@@ -17 +17 @@
 
   <para os="a">This is for the configuration of <command>silo</command>, similar
-  to what is in bootscripts.</para>
+  to what is in boot-scripts.</para>
 
 <screen><userinput>cat &gt; ${CLFS}/etc/silo.conf &lt;&lt; "EOF"

BOOK/boot/sparc64-64-chapter.xml

@@ -13 +13 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>

BOOK/boot/sparc64-chapter.xml

@@ -13 +13 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>

BOOK/boot/x86-chapter.xml

@@ -13 +13 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>

BOOK/boot/x86_64-64-chapter.xml

@@ -13 +13 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>

BOOK/boot/x86_64-chapter.xml

@@ -13 +13 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>

BOOK/introduction/common/changelog.xml

@@ -38 +38 @@
 
     <listitem>
+      <para>26 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Renamed bootscripts package to boot-scripts
+          (thanks to William Harrington for the suggestion) and removed the
+          patch as it is not needed for the new package.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>24 April 2014</para>
       <itemizedlist>

BOOK/materials/common/packages.xml

@@ -88 +88 @@
 
     <varlistentry>
-      <term>Bootscripts for CLFS (&bootscripts-clfs-version;) - <token>&bootscripts-clfs-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&bootscripts-clfs-home;"/></para>
-        <para>Download: <ulink url="&bootscripts-clfs-url;"/></para>
-        <para>MD5 sum: <literal>&bootscripts-clfs-md5;</literal></para>
+      <term>Boot-scripts for CLFS (&boot-scripts-clfs-version;) - <token>&boot-scripts-clfs-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&boot-scripts-clfs-home;"/></para>
+        <para>Download: <ulink url="&boot-scripts-clfs-url;"/></para>
+        <para>MD5 sum: <literal>&boot-scripts-clfs-md5;</literal></para>
       </listitem>
     </varlistentry>

BOOK/materials/common/patches.xml

@@ -25 +25 @@
         url="&patches-root;&bash-branch_update-patch;"/></para>
         <para>MD5 sum: <literal>&bash-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bootscripts Updates Patch - <token>&bootscripts-clfs-updates-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&bootscripts-clfs-updates-patch;"/></para>
-        <para>MD5 sum: <literal>&bootscripts-clfs-updates-patch-md5;</literal></para>
       </listitem>
     </varlistentry>

BOOK/packages.ent

@@ -68 +68 @@
 <!ENTITY bison-home "&gnu-software;bison">
 
-<!ENTITY bootscripts-clfs-version "2.1-pre1">
-<!ENTITY bootscripts-clfs-size "41 KB">
-<!-- <!ENTITY bootscripts-clfs-url "&packages-root;bootscripts-cross-lfs-&bootscripts-clfs-version;.tar.xz"> -->
-<!ENTITY bootscripts-clfs-url "http://cross-lfs.org/files/bootscripts-cross-lfs-&bootscripts-clfs-version;.tar.xz">
-<!ENTITY bootscripts-clfs-md5 "f474bf2efff744548a69d9049bad973f">
-<!ENTITY bootscripts-clfs-home " ">
+<!ENTITY boot-scripts-clfs-version "3.0-pre1">
+<!ENTITY boot-scripts-clfs-size "41 KB">
+<!ENTITY boot-scripts-clfs-url "&packages-root;boot-scripts-cross-lfs-&boot-scripts-clfs-version;.tar.bz2">
+<!ENTITY boot-scripts-clfs-md5 "f474bf2efff744548a69d9049bad973f">
+<!ENTITY boot-scripts-clfs-home " ">
 
 <!ENTITY bzip2-version "1.0.6">

BOOK/patches.ent

@@ -8 +8 @@
 <!ENTITY bash-branch_update-patch-md5 "64c6b5961f538a6b3d4c92f5c65ce51a">
 <!ENTITY bash-branch_update-patch-size "14.075 KB">
-
-<!ENTITY bootscripts-clfs-updates-patch "bootscripts-cross-lfs-&bootscripts-clfs-version;-updates-1.patch">
-<!ENTITY bootscripts-clfs-updates-patch-md5 "b584450a0baf3b0d71f319071feba111">
-<!ENTITY bootscripts-clfs-updates-patch-size "17.030 KB">
 
 <!-- Binutils branch update area