Changes in / [af0fe7f:8050e8b]

Location:

BOOK

Files:

• boot/64/e2fsprogs.xml (modified) (1 diff)
• boot/common/e2fsprogs.xml (modified) (1 diff)
• general.ent (modified) (1 diff)
• prologue/common/hostreqs.xml (modified) (1 diff)

BOOK/boot/64/e2fsprogs.xml

@@ -35 +35 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib" \
-  CC="${CC} ${BUILD64}" PKG_CONFIG=true \
-    ../configure --prefix=/tools --enable-elf-shlibs \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-libblkid --disable-libuuid --disable-fsck \
-    --disable-uuidd</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/boot/common/e2fsprogs.xml

@@ -54 +54 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
-    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/general.ent

@@ -3 +3 @@
 <!ENTITY month "02"> <!-- Use two digits -->
 <!ENTITY month_name "Feburary">
-<!ENTITY day "13"> <!-- Use two digits -->
+<!ENTITY day "10"> <!-- Use two digits -->
 <!ENTITY year "2011"> <!-- Use four digits -->
 

BOOK/prologue/common/hostreqs.xml

@@ -101 +101 @@
 
     <listitem>
-      <para><emphasis role="strong">Texinfo-4.7</emphasis></para>
+      <para><emphasis role="strong">Texinfo-4.4</emphasis></para>
     </listitem>