[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 7d97f36d6c68f7a3e42aeabc0732ea935a9c68d5
git
git at cross-lfs.org
Sat Apr 16 17:05:56 PDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via 7d97f36d6c68f7a3e42aeabc0732ea935a9c68d5 (commit)
via a32a66d653b9c64128be863bc57b9060cedfe67a (commit)
from 22cd957bfe9bccad26270cf1e5eb533b20eb0224 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7d97f36d6c68f7a3e42aeabc0732ea935a9c68d5
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sat Apr 16 20:05:16 2011 -0400
Add a patch to EGLIBC that fixes an issue with elf missing deps.
diff --git a/BOOK/final-system/alpha/eglibc.xml b/BOOK/final-system/alpha/eglibc.xml
index 256eba4..5fa1877 100644
--- a/BOOK/final-system/alpha/eglibc.xml
+++ b/BOOK/final-system/alpha/eglibc.xml
@@ -43,6 +43,14 @@
<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"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/common/eglibc.xml b/BOOK/final-system/common/eglibc.xml
index d02dca4..275fc9e 100644
--- a/BOOK/final-system/common/eglibc.xml
+++ b/BOOK/final-system/common/eglibc.xml
@@ -57,6 +57,12 @@ sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \
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
perfectly, even though the compiler specs file and linker are still
pointing at <filename class="directory">/tools</filename>. The specs
diff --git a/BOOK/final-system/mips/eglibc.xml b/BOOK/final-system/mips/eglibc.xml
index c0bef51..8bd3f74 100644
--- a/BOOK/final-system/mips/eglibc.xml
+++ b/BOOK/final-system/mips/eglibc.xml
@@ -43,6 +43,14 @@
<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"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
<para os="g1">MIPS is not supported in the main EGLIBC tree, so
diff --git a/BOOK/final-system/mips64-64/eglibc.xml b/BOOK/final-system/mips64-64/eglibc.xml
index d344ca4..efe2ec1 100644
--- a/BOOK/final-system/mips64-64/eglibc.xml
+++ b/BOOK/final-system/mips64-64/eglibc.xml
@@ -43,6 +43,14 @@
<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"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/mips64/eglibc-64bit.xml b/BOOK/final-system/mips64/eglibc-64bit.xml
index 48114df..94fc6af 100644
--- a/BOOK/final-system/mips64/eglibc-64bit.xml
+++ b/BOOK/final-system/mips64/eglibc-64bit.xml
@@ -38,6 +38,14 @@
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"
href="eglibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
diff --git a/BOOK/final-system/mips64/eglibc-n32.xml b/BOOK/final-system/mips64/eglibc-n32.xml
index 95b1027..99fd225 100644
--- a/BOOK/final-system/mips64/eglibc-n32.xml
+++ b/BOOK/final-system/mips64/eglibc-n32.xml
@@ -39,6 +39,14 @@ sed -i "s|libs -o|libs -L/usr/lib32 -Wl,-dynamic-linker=${LINKER} -o|" \
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"
href="eglibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
diff --git a/BOOK/final-system/mips64/eglibc.xml b/BOOK/final-system/mips64/eglibc.xml
index 42ede5a..aba9184 100644
--- a/BOOK/final-system/mips64/eglibc.xml
+++ b/BOOK/final-system/mips64/eglibc.xml
@@ -44,6 +44,14 @@
<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"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/eglibc-64bit.xml b/BOOK/final-system/multilib/eglibc-64bit.xml
index 8cc2de4..22e90a3 100644
--- a/BOOK/final-system/multilib/eglibc-64bit.xml
+++ b/BOOK/final-system/multilib/eglibc-64bit.xml
@@ -39,6 +39,14 @@ sed -i "s|libs -o|libs -L/usr/lib64 -Wl,-dynamic-linker=${LINKER} -o|" \
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"
href="eglibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
diff --git a/BOOK/final-system/multilib/eglibc.xml b/BOOK/final-system/multilib/eglibc.xml
index 1101c59..25279be 100644
--- a/BOOK/final-system/multilib/eglibc.xml
+++ b/BOOK/final-system/multilib/eglibc.xml
@@ -44,6 +44,14 @@
<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"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/ppc64/eglibc-64bit.xml b/BOOK/final-system/ppc64/eglibc-64bit.xml
index d0196f5..3921706 100644
--- a/BOOK/final-system/ppc64/eglibc-64bit.xml
+++ b/BOOK/final-system/ppc64/eglibc-64bit.xml
@@ -38,6 +38,14 @@
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"
href="eglibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
diff --git a/BOOK/final-system/ppc64/eglibc.xml b/BOOK/final-system/ppc64/eglibc.xml
index 3db3062..ad661e8 100644
--- a/BOOK/final-system/ppc64/eglibc.xml
+++ b/BOOK/final-system/ppc64/eglibc.xml
@@ -44,6 +44,14 @@
<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"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
<para os="u1">The powerpc (32) architecture is expected to fail the
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index f1a91a0..6e3fdf8 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -46,6 +46,15 @@
</varlistentry>
<varlistentry>
+ <term>EGLIBC Dl Dep Fix Patch - <token>&eglibc-dl_dep_fix-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink
+ url="&patches-root;&eglibc-dl_dep_fix-patch;"/></para>
+ <para>MD5 sum: <literal>&eglibc-dl_dep_fix-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Flex GCC 4.4.x Patch - <token>&flex-gcc44-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 5393de2..33f3325 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -20,6 +20,10 @@
<!ENTITY flex-gcc44-patch-md5 "a6ffbba93d034380e12110bb6d399113">
<!ENTITY flex-gcc44-patch-size "12 KB">
+<!ENTITY eglibc-dl_dep_fix-patch "eglibc-&eglibc-fversion;-dl_dep_fix-1.patch">
+<!ENTITY eglibc-dl_dep_fix-patch-md5 "fd640e7758e8560839bde1358ee44885">
+<!ENTITY eglibc-dl_dep_fix-patch-size "4 KB">
+
<!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
<!ENTITY gcc-specs-patch-md5 "61d583984f9f12b6f37141e132fc7d57">
<!ENTITY gcc-specs-patch-size "20 KB">
diff --git a/patches/eglibc-2.13-r13356-dl_dep_fix-1.patch b/patches/eglibc-2.13-r13356-dl_dep_fix-1.patch
new file mode 100644
index 0000000..202c287
--- /dev/null
+++ b/patches/eglibc-2.13-r13356-dl_dep_fix-1.patch
@@ -0,0 +1,32 @@
+Submitted By: Joe Ciccone <jciccone at gmail.com>
+Date: 2011-04-16
+Initial Package Version: 2.13 r13356
+Origin: Andreas Schwab
+ Via http://sourceware.org/ml/libc-hacker/2011-02/msg00002.html
+Upstream Status: Unknown, In Bugzilla
+Description: If a ELF binaries dependencies are missing it was causing
+ a signal too early.
+
+diff -Naur eglibc-2.13.orig/elf/dl-deps.c eglibc-2.13/elf/dl-deps.c
+--- eglibc-2.13.orig/elf/dl-deps.c 2011-02-04 22:31:21.000000000 +0000
++++ eglibc-2.13/elf/dl-deps.c 2011-04-16 23:44:34.479218974 +0000
+@@ -491,6 +491,10 @@
+ if (errno == 0 && errno_saved != 0)
+ __set_errno (errno_saved);
+
++ if (errno_reason)
++ _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
++ NULL, errstring);
++
+ struct link_map **old_l_initfini = NULL;
+ if (map->l_initfini != NULL && map->l_type == lt_loaded)
+ {
+@@ -683,8 +687,4 @@
+ }
+ if (old_l_initfini != NULL)
+ _dl_scope_free (old_l_initfini);
+-
+- if (errno_reason)
+- _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
+- NULL, errstring);
+ }
commit a32a66d653b9c64128be863bc57b9060cedfe67a
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sat Apr 16 19:39:51 2011 -0400
Simplify the modification of the eglibc sanity check script.
diff --git a/BOOK/final-system/mips64/eglibc-n32.xml b/BOOK/final-system/mips64/eglibc-n32.xml
index 3f470cf..95b1027 100644
--- a/BOOK/final-system/mips64/eglibc-n32.xml
+++ b/BOOK/final-system/mips64/eglibc-n32.xml
@@ -33,7 +33,7 @@
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
-<screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib32/libc-* | cut -f1 -d:) | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
+<screen os="l4"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
sed -i "s|libs -o|libs -L/usr/lib32 -Wl,-dynamic-linker=${LINKER} -o|" \
scripts/test-installation.pl
unset LINKER</userinput></screen>
diff --git a/BOOK/final-system/multilib/eglibc-64bit.xml b/BOOK/final-system/multilib/eglibc-64bit.xml
index 9a24a83..8cc2de4 100644
--- a/BOOK/final-system/multilib/eglibc-64bit.xml
+++ b/BOOK/final-system/multilib/eglibc-64bit.xml
@@ -33,7 +33,7 @@
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
-<screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib64/libc-* | cut -f1 -d:) | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
+<screen os="l4"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
sed -i "s|libs -o|libs -L/usr/lib64 -Wl,-dynamic-linker=${LINKER} -o|" \
scripts/test-installation.pl
unset LINKER</userinput></screen>
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/alpha/eglibc.xml | 8 ++++++
BOOK/final-system/common/eglibc.xml | 6 ++++
BOOK/final-system/mips/eglibc.xml | 8 ++++++
BOOK/final-system/mips64-64/eglibc.xml | 8 ++++++
BOOK/final-system/mips64/eglibc-64bit.xml | 8 ++++++
BOOK/final-system/mips64/eglibc-n32.xml | 10 +++++++-
BOOK/final-system/mips64/eglibc.xml | 8 ++++++
BOOK/final-system/multilib/eglibc-64bit.xml | 10 +++++++-
BOOK/final-system/multilib/eglibc.xml | 8 ++++++
BOOK/final-system/ppc64/eglibc-64bit.xml | 8 ++++++
BOOK/final-system/ppc64/eglibc.xml | 8 ++++++
BOOK/materials/common/patches.xml | 9 +++++++
BOOK/patches.ent | 4 +++
patches/eglibc-2.13-r13356-dl_dep_fix-1.patch | 32 +++++++++++++++++++++++++
14 files changed, 133 insertions(+), 2 deletions(-)
create mode 100644 patches/eglibc-2.13-r13356-dl_dep_fix-1.patch
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list