r982 - in trunk/BOOK: final-system/alpha final-system/mips final-system/ppc final-system/sparc final-system/sparc64 final-system/sparc64-64 final-system/x86 final-system/x86_64 final-system/x86_64-64 introduction/common

ken at linuxfromscratch.org ken at linuxfromscratch.org
Sat Dec 31 08:39:08 PST 2005


Author: ken
Date: 2005-12-31 09:39:07 -0700 (Sat, 31 Dec 2005)
New Revision: 982

Modified:
   trunk/BOOK/final-system/alpha/linux-libc-headers.xml
   trunk/BOOK/final-system/mips/linux-libc-headers.xml
   trunk/BOOK/final-system/ppc/linux-libc-headers.xml
   trunk/BOOK/final-system/sparc/linux-libc-headers.xml
   trunk/BOOK/final-system/sparc64-64/linux-libc-headers.xml
   trunk/BOOK/final-system/sparc64/linux-libc-headers.xml
   trunk/BOOK/final-system/x86/linux-libc-headers.xml
   trunk/BOOK/final-system/x86_64-64/linux-libc-headers.xml
   trunk/BOOK/final-system/x86_64/linux-libc-headers.xml
   trunk/BOOK/introduction/common/changelog.xml
Log:
Make install of asm headers repeatable (for reruns).

Modified: trunk/BOOK/final-system/alpha/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/alpha/linux-libc-headers.xml	2005-12-31 16:00:09 UTC (rev 981)
+++ trunk/BOOK/final-system/alpha/linux-libc-headers.xml	2005-12-31 16:39:07 UTC (rev 982)
@@ -29,7 +29,8 @@
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>cp -R include/asm-alpha /usr/include/asm
+<screen><userinput>install -d /usr/include/asm
+cp -R include/asm-alpha/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
 cp -R include/scsi /usr/include</userinput></screen>

Modified: trunk/BOOK/final-system/mips/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/mips/linux-libc-headers.xml	2005-12-31 16:00:09 UTC (rev 981)
+++ trunk/BOOK/final-system/mips/linux-libc-headers.xml	2005-12-31 16:39:07 UTC (rev 982)
@@ -37,7 +37,8 @@
 
 <screen os="md"><userinput>patch -Np1 -i ../&linux-libc-headers-mips_atomic_fix-patch;</userinput></screen>
 
-<screen os="me"><userinput>cp -R include/asm-mips /usr/include/asm
+<screen os="me"><userinput>install -d /usr/include/asm
+cp -R include/asm-mips/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
 cp -R include/scsi /usr/include</userinput></screen>

Modified: trunk/BOOK/final-system/ppc/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/ppc/linux-libc-headers.xml	2005-12-31 16:00:09 UTC (rev 981)
+++ trunk/BOOK/final-system/ppc/linux-libc-headers.xml	2005-12-31 16:39:07 UTC (rev 982)
@@ -29,7 +29,8 @@
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>cp -R include/asm-ppc /usr/include/asm
+<screen><userinput>install -d /usr/include/asm
+cp -R include/asm-ppc/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
 cp -R include/scsi /usr/include</userinput></screen>

Modified: trunk/BOOK/final-system/sparc/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/sparc/linux-libc-headers.xml	2005-12-31 16:00:09 UTC (rev 981)
+++ trunk/BOOK/final-system/sparc/linux-libc-headers.xml	2005-12-31 16:39:07 UTC (rev 982)
@@ -33,7 +33,8 @@
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>cp -R include/asm-sparc /usr/include/asm
+<screen><userinput>install -d /usr/include/asm
+cp -R include/asm-sparc/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
 cp -R include/scsi /usr/include</userinput></screen>

Modified: trunk/BOOK/final-system/sparc64/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/sparc64/linux-libc-headers.xml	2005-12-31 16:00:09 UTC (rev 981)
+++ trunk/BOOK/final-system/sparc64/linux-libc-headers.xml	2005-12-31 16:39:07 UTC (rev 982)
@@ -42,10 +42,10 @@
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -d /usr/include
+<screen><userinput>install -d /usr/include/asm
 cp -R include/asm-sparc64 /usr/include/
 cp -R include/asm-sparc /usr/include/
-cp -R include/asm-sparc-biarch /usr/include/asm
+cp -R include/asm-sparc-biarch/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
 cp -R include/scsi /usr/include</userinput></screen>

Modified: trunk/BOOK/final-system/sparc64-64/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/sparc64-64/linux-libc-headers.xml	2005-12-31 16:00:09 UTC (rev 981)
+++ trunk/BOOK/final-system/sparc64-64/linux-libc-headers.xml	2005-12-31 16:39:07 UTC (rev 982)
@@ -37,8 +37,8 @@
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -d /usr/include
-cp -R include/asm-sparc64 /usr/include/asm
+<screen><userinput>install -d /usr/include/asm
+cp -R include/asm-sparc64/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
 cp -R include/scsi /usr/include</userinput></screen>

Modified: trunk/BOOK/final-system/x86/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/x86/linux-libc-headers.xml	2005-12-31 16:00:09 UTC (rev 981)
+++ trunk/BOOK/final-system/x86/linux-libc-headers.xml	2005-12-31 16:39:07 UTC (rev 982)
@@ -43,7 +43,8 @@
 
     <para os="b">Install the header files:</para>
 
-<screen><userinput>cp -R include/asm-i386 /usr/include/asm
+<screen><userinput>install -d /usr/include/asm
+cp -R include/asm-i386/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
 cp -R include/scsi /usr/include</userinput></screen>

Modified: trunk/BOOK/final-system/x86_64/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/x86_64/linux-libc-headers.xml	2005-12-31 16:00:09 UTC (rev 981)
+++ trunk/BOOK/final-system/x86_64/linux-libc-headers.xml	2005-12-31 16:39:07 UTC (rev 982)
@@ -34,10 +34,10 @@
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -d /usr/include
+<screen><userinput>install -d /usr/include/asm
 cp -R include/asm-i386 /usr/include/
 cp -R include/asm-x86_64 /usr/include/
-cp -R include/asm-x86_64-biarch /usr/include/asm
+cp -R include/asm-x86_64-biarch/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
 cp -R include/scsi /usr/include</userinput></screen>

Modified: trunk/BOOK/final-system/x86_64-64/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/x86_64-64/linux-libc-headers.xml	2005-12-31 16:00:09 UTC (rev 981)
+++ trunk/BOOK/final-system/x86_64-64/linux-libc-headers.xml	2005-12-31 16:39:07 UTC (rev 982)
@@ -29,8 +29,8 @@
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -d /usr/include
-cp -R include/asm-x86_64 /usr/include/asm
+<screen><userinput>install -d /usr/include/asm
+cp -R include/asm-x86_64/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
 cp -R include/scsi /usr/include</userinput></screen>

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2005-12-31 16:00:09 UTC (rev 981)
+++ trunk/BOOK/introduction/common/changelog.xml	2005-12-31 16:39:07 UTC (rev 982)
@@ -36,6 +36,16 @@
     </listitem>
 -->
     <listitem>
+      <para>December 31, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Alter install of linux-libc-headers in final-system to
+	  be repeatable if rerun.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 30, 2005</para>
       <itemizedlist>
         <listitem>




More information about the cross-lfs mailing list