Changeset 229ed25 for BOOK/boot/multilib/grub-build.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (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 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/boot/multilib/grub-build.xml (moved) (moved from BOOK/temp-system/multilib/ppl.xml) (2 diffs)

BOOK/boot/multilib/grub-build.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-temp-system-ppl" role="wrap">
-  <?dbhtml filename="ppl.html"?>
+<sect1 id="ch-boot-grub-build" role="wrap">
+  <?dbhtml filename="grub-build.html"?>
 
-  <title>PPL-&ppl-version;</title>
+  <title>GRUB-&grub-version;</title>
 
-  <indexterm zone="ch-temp-system-ppl">
-    <primary sortas="a-PPL">PPL</primary>
-    <secondary>temporary system</secondary>
+  <indexterm zone="ch-boot-grub-build">
+    <primary sortas="a-GRUB">GRUB</primary>
+    <secondary>boot</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/ppl.xml"
+  href="../../final-system/x86/grub.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of PPL</title>
+    <title>Installation of GRUB</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../../final-system/x86/grub.xml"
+    xpointer="xpointer(//*[@os='n1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/x86/grub.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/x86/grub.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/x86/grub.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --enable-interfaces="c,cxx" --libdir=/tools/lib64 --enable-shared \
-    --disable-optimization --with-libgmp-prefix=/tools \
-    --with-libgmpxx-prefix=/tools</userinput></screen>
+    --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
-    xpointer="xpointer(//*[@os='bp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
-    xpointer="xpointer(//*[@os='bp2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../../final-system/x86/grub.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../../final-system/x86/grub.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-        
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../../final-system/x86/grub.xml"
     xpointer="xpointer(//*[@os='f'])"/>
+
+<screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
@@ -63 +63 @@
 
     <para>Details on this package are located in <xref
-    linkend="contents-ppl" role="."/></para>
+    linkend="contents-grub" role="."/></para>
 
   </sect2>