Changeset 7d97f36 for BOOK/final-system

Timestamp:

Apr 16, 2011, 5:05:16 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

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

Children:

b6831b6

Parents:

a32a66d

Message:

Add a patch to EGLIBC that fixes an issue with elf missing deps.

Location:

BOOK/final-system

Files:

• alpha/eglibc.xml (modified) (1 diff)
• common/eglibc.xml (modified) (1 diff)
• mips/eglibc.xml (modified) (1 diff)
• mips64-64/eglibc.xml (modified) (1 diff)
• mips64/eglibc-64bit.xml (modified) (1 diff)
• mips64/eglibc-n32.xml (modified) (1 diff)
• mips64/eglibc.xml (modified) (1 diff)
• multilib/eglibc-64bit.xml (modified) (1 diff)
• multilib/eglibc.xml (modified) (1 diff)
• ppc64/eglibc-64bit.xml (modified) (1 diff)
• ppc64/eglibc.xml (modified) (1 diff)

BOOK/final-system/alpha/eglibc.xml

@@ -41 +41 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/common/eglibc.xml

@@ -57 +57 @@
   scripts/test-installation.pl
 unset LINKER</userinput></screen>
+
+    <para os="p1">The following patch fixes an issue where EGLIBC will
+    improperly handle a condition where an elf binary has missing
+    dependencies:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&eglibc-dl_dep_fix-patch;</userinput></screen>
 
     <para os="b">The EGLIBC build system is self-contained and will install

BOOK/final-system/mips/eglibc.xml

@@ -41 +41 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/mips64-64/eglibc.xml

@@ -41 +41 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/mips64/eglibc-64bit.xml

@@ -37 +37 @@
     href="../multilib/eglibc-64bit.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/mips64/eglibc-n32.xml

@@ -38 +38 @@
   scripts/test-installation.pl
 unset LINKER</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/mips64/eglibc.xml

@@ -42 +42 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/eglibc-64bit.xml

@@ -38 +38 @@
   scripts/test-installation.pl
 unset LINKER</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/eglibc.xml

@@ -42 +42 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/ppc64/eglibc-64bit.xml

@@ -37 +37 @@
     href="../multilib/eglibc-64bit.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/ppc64/eglibc.xml

@@ -42 +42 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"