Changeset 03e6a40 for BOOK/boot/x86

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (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:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

Location:

BOOK/boot/x86

Files:

• grub-build.xml (modified) (2 diffs)
• kernel.xml (modified) (4 diffs)

BOOK/boot/x86/grub-build.xml

@@ -41 +41 @@
 <screen os="ab"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --sysconfdir=/etc --disable-werror</userinput></screen>
+    --disable-werror --enable-grub-mkfont=no</userinput></screen>
+
+<para os="b">The meaning of the new configure option:</para>
+
+  <variablelist os="bc">
+    <varlistentry>
+      <term><parameter>--enable-grub-mkfont=no</parameter></term>
+      <listitem><para>Prevents GRUB from trying to build
+      <command>grub-mkfont</command>, which requires Freetype.</para></listitem>
+    </varlistentry>
+
+  </variablelist>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -55 +66 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="ag"><userinput>make install</userinput></screen>
 
   </sect2>

BOOK/boot/x86/kernel.xml

@@ -80 +80 @@
 
 <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
-    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+    INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -87 +87 @@
 
 <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
 
     <para os="u">After kernel compilation is complete, additional steps are
     required to complete the installation. Some files need to be copied to
-    the <filename class="directory">${CLFS}/boot</filename> directory.</para>
+    the <filename class="directory">/tools/boot</filename> directory.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
+    <para os="v">Issue the following commands to install the kernel:</para>
 
-<screen><userinput>cp -v arch/i386/boot/bzImage ${CLFS}/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/i386/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -103 +101 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen os="w1"><userinput>cp -v System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
+<screen os="w1"><userinput>cp -v System.map /tools/boot/System.map-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -109 +107 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen os="x1"><userinput>cp -v .config ${CLFS}/boot/config-&linux-version;</userinput></screen>
+<screen os="x1"><userinput>cp -v .config /tools/boot/config-&linux-version;</userinput></screen>
 
   </sect2>