r1129 - in trunk/BOOK: cross-tools/ppc64 final-system final-system/ppc64 introduction/ppc64

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Thu Feb 2 07:30:22 PST 2006


Author: jhuntwork
Date: 2006-02-02 08:30:22 -0700 (Thu, 02 Feb 2006)
New Revision: 1129

Added:
   trunk/BOOK/final-system/ppc64/
   trunk/BOOK/final-system/ppc64/linux-libc-headers.xml
Modified:
   trunk/BOOK/cross-tools/ppc64/linux-libc-headers.xml
   trunk/BOOK/final-system/ppc64-chapter.xml
   trunk/BOOK/introduction/ppc64/changelog.xml
Log:
Fix linux-libc-headers to use biarch patch in ppc64 multilib

Modified: trunk/BOOK/cross-tools/ppc64/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/ppc64/linux-libc-headers.xml	2006-02-02 04:06:43 UTC (rev 1128)
+++ trunk/BOOK/cross-tools/ppc64/linux-libc-headers.xml	2006-02-02 15:30:22 UTC (rev 1129)
@@ -22,10 +22,20 @@
   <sect2 role="installation">
     <title>Installation of Linux-Libc-Headers</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/ppc64/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/ppc64/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
     <para>Install the header files:</para>
 
 <screen><userinput>install -dv /tools/include
-cp -Rv include/asm-ppc /tools/include/asm
+cp -Rv include/asm-ppc /tools/include/
+cp -Rv include/asm-ppc64 /tools/include/
+cp -Rv include/asm-ppc-biarch /tools/include/asm
 cp -Rv include/linux /tools/include</userinput></screen>
 
   </sect2>

Added: trunk/BOOK/final-system/ppc64/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/ppc64/linux-libc-headers.xml	                        (rev 0)
+++ trunk/BOOK/final-system/ppc64/linux-libc-headers.xml	2006-02-02 15:30:22 UTC (rev 1129)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-linux-libc-headers" role="wrap">
+  <?dbhtml filename="linux-libc-headers.html"?>
+
+  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
+
+  <indexterm zone="ch-system-linux-libc-headers">
+    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-libc-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Linux-Libc-Headers</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <para os="aa">The following patch contains header stubs which link to the
+    proper header from either asm-ppc or asm-ppc64:</para>
+
+<screen os="ab"><userinput>patch -Np1 -i ../&linux-libc-headers-ppc_biarch-patch;</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen><userinput>install -dv /usr/include/{asm,asm-ppc,asm-ppc64,linux,mtd,scsi}
+cp -arv include/asm-ppc/* /usr/include/asm-ppc
+cp -arv include/asm-ppc64/* /usr/include/asm-ppc64
+cp -arv include/asm-ppc-biarch/* /usr/include/asm
+cp -arv include/linux/* /usr/include/linux
+cp -arv include/mtd/* /usr/include/mtd
+cp -arv include/scsi/* /usr/include/scsi</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen><userinput>chown -R root:root /usr/include/{asm,asm-ppc,asm-ppc64,linux,mtd,scsi}</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-libc-headers.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+<screen><userinput>find /usr/include/{asm,asm-ppc,asm-ppc64,linux,mtd,scsi} -type d -exec chmod 755 {} \;
+find /usr/include/{asm,asm-ppc,asm-ppc64,linux,mtd,scsi} -type f -exec chmod 644 {} \;</userinput></screen>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-libc-headers.xml"
+  xpointer="xpointer(id('contents-linux-libc-headers'))"/>
+
+</sect1>

Modified: trunk/BOOK/final-system/ppc64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/ppc64-chapter.xml	2006-02-02 04:06:43 UTC (rev 1128)
+++ trunk/BOOK/final-system/ppc64-chapter.xml	2006-02-02 15:30:22 UTC (rev 1129)
@@ -14,7 +14,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/adjusting.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>

Modified: trunk/BOOK/introduction/ppc64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/ppc64/changelog.xml	2006-02-02 04:06:43 UTC (rev 1128)
+++ trunk/BOOK/introduction/ppc64/changelog.xml	2006-02-02 15:30:22 UTC (rev 1129)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>February 2, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jhuntwork] - Fix linux-libc-headers to use multilib patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 1, 2006</para>
       <itemizedlist>
         <listitem>




More information about the cross-lfs mailing list