Changeset 1ab9a96 for BOOK

Timestamp:

05/17/14 08:41:51 (10 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

3205da5

Parents:

b4badbd (diff), 156c0fe (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:

Fix conflicts with merge.

Location:

BOOK

Files:

• boot/common/bootscripts.xml (modified) (1 diff)
• bootable/x86/kernel.xml (modified) (2 diffs)
• final-system/common/kbd.xml (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)
• materials/common/patches.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)

BOOK/boot/common/bootscripts.xml

@@ -26 +26 @@
     <title>Installation of Bootscripts</title>
 
+    <para os="p1">Apply a patch which modifies the scripts for use in
+    <filename class="directory">/tools</filename>:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&bootscripts-clfs-tools_updates-patch;</userinput></screen>
+
     <para os="a">Install the package:</para>
 
-<screen os="b"><userinput>make DESTDIR=/tools install-bootscripts</userinput></screen>
+<screen os="b"><userinput>make DESTDIR=/tools install-minimal</userinput></screen>
 
   <para os="c">The <command>setclock</command> script reads the time from the

BOOK/bootable/x86/kernel.xml

@@ -42 +42 @@
 
     <para>Be sure to enable or disable following features or the system might
-    not work correctly or boot at all.<!-- Refer to
-    <filename>/usr/share/doc/systemd-&systemd-version;/README</filename> -->:</para>
+    not work correctly or boot at all:</para>
 
     <screen role="nodump">Device Drivers  ---&gt;
@@ -53 +52 @@
     <note os="kd"><para>While "The IPv6 Protocol" is not strictly required, it
     is highly recommended by the Systemd developers. "EFI Variable support" and
-    "EFI GUID Partition support" are for UEFI systems. "Collect scheduler
-    debugging info" and "Collect scheduler statistics" is for systemd-bootchart.
-    </para></note>
+    "EFI GUID Partition support" are for UEFI systems.</para></note>
 
     <para os="h">Configure the kernel via a menu-driven interface.

BOOK/final-system/common/kbd.xml

@@ -43 +43 @@
 <screen os="h"><userinput>make install</userinput></screen>
 
-    <para os="i">Some of the programs from Kbd are used by systemd to
-    initialize the system, those binaries need to be on the root
+    <para os="i">Some of the programs from Kbd are used by the CLFS Bootscripts
+    to initialize the system, so those binaries need to be on the root
     partition:</para>
 
-<screen os="j"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
+<screen os="j"><userinput>mv -v /usr/bin/{dumpkeys,kbd_mode,loadkeys,setfont} /bin</userinput></screen>
 
     <para os="k">Install the documentation:</para>

BOOK/introduction/common/changelog.xml

@@ -43 +43 @@
           <para>[William Harrington] - Move <command>logger</command> to
           <filename class="directory">/bin</filename> for CLFS-Bootscripts
+        </listitem>
+        <listitem>
           requirement..</para>
+          <para>[Chris] - Changed "systemd" reference on Kbd page to
+          CLFS Bootscripts, and added dumpkeys and kbd_mode to list of
+          programs moved to /bin as they're used in the bootscripts.</para>
         </listitem>
       </itemizedlist>

BOOK/materials/common/patches.xml

@@ -38 +38 @@
     </varlistentry>
 -->
+    <varlistentry>
+      <term>Bootscripts Cross-LFS Updates Patch - <token>&bootscripts-clfs-tools_updates-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&bootscripts-clfs-tools_updates-patch;"/></para>
+        <para>MD5 sum: <literal>&bootscripts-clfs-tools_updates-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Coreutils Uname Patch - <token>&coreutils-uname-patch-size;</token>:</term>

BOOK/patches.ent

@@ -14 +14 @@
 <!ENTITY binutils-branch_update-patch-size "5,268 KB">
 -->
+
+<!ENTITY bootscripts-clfs-tools_updates-patch "bootscripts-cross-lfs-&bootscripts-clfs-version;-tools_updates-1.patch">
+<!ENTITY bootscripts-clfs-tools_updates-patch-md5 "9bbc4c0d5caed7f50be7ac5ea2897e3f">
+<!ENTITY bootscripts-clfs-tools_updates-patch-size "18.718 KB">
 
 <!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">