Changeset 71cd9de for BOOK/final-system

Timestamp:

Oct 17, 2015, 3:01:41 PM (9 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

master, systemd

Children:

9b4ea58

Parents:

e869c0f

Message:

Update GLIBC from 2.21 to 2.22 and remove rttldir from config.cache.

Location:

BOOK/final-system

Files:

• mips64-64/glibc.xml (modified) (1 diff)
• multilib/glibc-64bit.xml (modified) (1 diff)
• ppc64-64/glibc.xml (modified) (2 diffs)
• sparc64-64/glibc.xml (modified) (1 diff)
• x86_64-64/glibc.xml (modified) (2 diffs)

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

@@ -53 +53 @@
     href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l7'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l8'])"/>
 
     <para>Now we will force Glibc to build as 64-bit instead of the default

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

@@ -46 +46 @@
     <filename class="directory">/lib64</filename>:</para>
 
-<screen os="m2"><userinput>echo "libc_cv_rtlddir=/lib64" &gt;&gt; config.cache
-echo "libc_cv_slibdir=/lib64" &gt;&gt; config.cache</userinput></screen>
+<screen os="m2"><userinput>echo "libc_cv_slibdir=/lib64" &gt;&gt; config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/ppc64-64/glibc.xml

@@ -53 +53 @@
     href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l7'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l8'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -119 +127 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <para>Now we can remove this symlink. We also need to correct the <command>
-    /usr/bin/ldd</command> script - if you look at this, you will see it references
-    not only the 32-bit linker, but also /lib64 where it thinks the 64-bit linker
-    is. The following <command>sed</command> will correct this:</para>
+    <para>Now we can remove this symlink:</para>
 
-    <screen><userinput>rm -v /lib/ld.so.1
-sed -i.bak '/RTLDLIST/s%/ld.so.1 /lib64%%' /usr/bin/ldd</userinput></screen>
-
-    <para>Check the script to make sure the sed worked correctly, then delete
-    the backup.</para>
-
-    <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
+    <screen><userinput>rm -v /lib/ld.so.1</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/sparc64-64/glibc.xml

@@ -61 +61 @@
     href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l7'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l8'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/x86_64-64/glibc.xml

@@ -49 +49 @@
     <filename class="directory">/lib</filename>:</para>
 
-<screen os="l6"><userinput>echo "libc_cv_rtlddir=/lib" &gt;&gt; config.cache
-echo "libc_cv_slibdir=/lib" &gt;&gt; config.cache</userinput></screen>
+<screen os="l6"><userinput>echo "libc_cv_slibdir=/lib" &gt;&gt; config.cache</userinput></screen>
+
+    <para os="l7">Modify the <command>ldd</command> rewrite script to remove
+    <filename class="directory">lib64</filename> and
+    <filename class="directory">libx32</filename> from RTLDLIST.</para>
+
+<screen os="l8"><userinput>sed -i '/RTLDLIST/d' sysdeps/unix/sysv/linux/*/ldd-rewrite.sed</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -127 +132 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <para>Now we can remove this symlink.  We also need to correct the <command>
-    /usr/bin/ldd</command> script - if you look at this, you will see it references
-    not only the 32-bit linker, but also /lib64 where it thinks the 64-bit linker
-    is. The following <command>sed</command> will correct this:</para>
+    <para>Now we can remove this symlink:</para>
 
-    <screen><userinput>rm -v /lib/ld-linux.so.2
-sed -i.bak '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd</userinput></screen>
-
-    <para>Check the script to make sure the sed worked correctly, then delete
-    the backup.</para>
-
-    <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
+    <screen><userinput>rm -v /lib/ld-linux.so.2</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"