Changeset 2beb5fd

Timestamp:

Dec 2, 2006, 8:45:48 PM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

fc90d77

Parents:

efbbbaf

Message:

Update to build to fix e2fsprogs GLIBC Error

Location:

BOOK/boot

Files:

• 64/e2fsprogs.xml (modified) (1 diff)
• common/e2fsprogs.xml (modified) (1 diff)
• multilib/e2fsprogs.xml (modified) (1 diff)
• ppc64/e2fsprogs.xml (modified) (1 diff)

BOOK/boot/64/e2fsprogs.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/boot/common/e2fsprogs.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
+
+    <para os="s1">We will disable the building of the test progs. This
+    will prevent a glibc error during our build.</para>
+
+<screen os="s2"><userinput>cp Makefile.in{,.orig}
+sed -e 's@tests/progs@@g' Makefile.in.orig > Makefile.in </userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/boot/multilib/e2fsprogs.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <para os="m1">Make sure the libraries get installed to

BOOK/boot/ppc64/e2fsprogs.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <para os="a1">This package cannot be cross-compiled for ppc64 on some