Changeset 026bb5d for BOOK/final-system/x86

Timestamp:

Dec 18, 2013, 1:04:00 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (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:

Updated simp branch to match main book

Location:

BOOK/final-system/x86

Files:

• eglibc.xml (modified) (2 diffs)
• grub.xml (modified) (3 diffs)

BOOK/final-system/x86/eglibc.xml

@@ -48 +48 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
@@ -58 +66 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $MACHTYPE) \
-    -mtune=generic -g -O2" ../eglibc-&eglibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/eglibc</userinput></screen>
+<screen os="h"><userinput>
+    CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $MACHTYPE) -O2" \
+    ../eglibc-&eglibc-version;/configure --prefix=/usr \
+    --disable-profile --enable-kernel=2.6.32 --libexecdir=/usr/lib/eglibc \
+    --enable-obsolete-rpc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/x86/grub.xml

@@ -33 +33 @@
     <note os="n2">
       <para>This package is known to have issues when its default optimization
-      flags (including the <option>-march</option> and <option>-mcpu</option>
+      flags (including the <option>-march</option> and <option>-mtune</option>
       options) are changed. If any environment variables that override default
       optimizations have been defined, such as <envar>CFLAGS</envar> and
@@ -39 +39 @@
     </note>
 
+    <para os="s1">EGLIBC-&eglibc-version; does not declare gets():</para>
+
+<screen os="s2"><userinput>sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h</userinput></screen>
+
     <para os="a">Prepare GRUB for compilation:</para>
 
@@ -48 +52 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test GRUB you must have QEMU installed and then, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test GRUB you must have QEMU installed and then, issue:</para>
+
+<screen os="d2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>