r985 - 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

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sat Dec 31 12:59:56 PST 2005


Author: jim
Date: 2005-12-31 13:59:55 -0700 (Sat, 31 Dec 2005)
New Revision: 985

Modified:
   trunk/BOOK/
   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
Log:
 r1241 at server:  jim | 2005-12-31 12:59:21 -0800
 Fixed improper copying of linux-libc-headers



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1237
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1241
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/final-system/alpha/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/alpha/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
+++ trunk/BOOK/final-system/alpha/linux-libc-headers.xml	2005-12-31 20:59:55 UTC (rev 985)
@@ -31,9 +31,9 @@
 
 <screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
 cp -arv include/asm-alpha/* /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>
+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"

Modified: trunk/BOOK/final-system/mips/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/mips/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
+++ trunk/BOOK/final-system/mips/linux-libc-headers.xml	2005-12-31 20:59:55 UTC (rev 985)
@@ -39,9 +39,9 @@
 
 <screen os="me"><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
 cp -arv include/asm-mips/* /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>
+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"

Modified: trunk/BOOK/final-system/ppc/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/ppc/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
+++ trunk/BOOK/final-system/ppc/linux-libc-headers.xml	2005-12-31 20:59:55 UTC (rev 985)
@@ -31,9 +31,9 @@
 
 <screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
 cp -arv include/asm-ppc/* /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>
+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"

Modified: trunk/BOOK/final-system/sparc/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/sparc/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
+++ trunk/BOOK/final-system/sparc/linux-libc-headers.xml	2005-12-31 20:59:55 UTC (rev 985)
@@ -35,8 +35,8 @@
 
 <screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
 cp -arv include/asm-sparc/* /usr/include/asm
-cp -arv include/linux /usr/include/linux
-cp -arv include/mtd /usr/include/mtd
+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"

Modified: trunk/BOOK/final-system/sparc64/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/sparc64/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
+++ trunk/BOOK/final-system/sparc64/linux-libc-headers.xml	2005-12-31 20:59:55 UTC (rev 985)
@@ -43,12 +43,12 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>install -dv /usr/include/{asm,asm-sparc64,asm-sparc,linux,mtd,scsi]
-cp -arv include/asm-sparc64 /usr/include/asm-sparc64
-cp -arv include/asm-sparc /usr/include/asm-sparc
+cp -arv include/asm-sparc64/* /usr/include/asm-sparc64
+cp -arv include/asm-sparc/* /usr/include/asm-sparc
 cp -arv include/asm-sparc-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>
+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"

Modified: trunk/BOOK/final-system/sparc64-64/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/sparc64-64/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
+++ trunk/BOOK/final-system/sparc64-64/linux-libc-headers.xml	2005-12-31 20:59:55 UTC (rev 985)
@@ -39,9 +39,9 @@
 
 <screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
 cp -arv include/asm-sparc64/* /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>
+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"

Modified: trunk/BOOK/final-system/x86/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/x86/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
+++ trunk/BOOK/final-system/x86/linux-libc-headers.xml	2005-12-31 20:59:55 UTC (rev 985)
@@ -45,9 +45,9 @@
 
 <screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
 cp -arv include/asm-i386/* /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>
+cp -arv include/linux/* /usr/include/linux
+cp -arv include/mtd/* /usr/include/mtd
+cp -arv include/scsi/* /usr/include/scsi</userinput></screen>
 
     <para os="c">Ensure that all the headers are owned by
     <systemitem class="username">root</systemitem>:</para>

Modified: trunk/BOOK/final-system/x86_64/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/x86_64/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
+++ trunk/BOOK/final-system/x86_64/linux-libc-headers.xml	2005-12-31 20:59:55 UTC (rev 985)
@@ -35,12 +35,12 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>install -dv /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,scsi}
-cp -arv include/asm-i386 /usr/include/asm-i386
-cp -arv include/asm-x86_64 /usr/include/asm-x86_64
+cp -arv include/asm-i386/* /usr/include/asm-i386
+cp -arv include/asm-x86_64/* /usr/include/asm-x86_64
 cp -arv include/asm-x86_64-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>
+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"

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 19:16:01 UTC (rev 984)
+++ trunk/BOOK/final-system/x86_64-64/linux-libc-headers.xml	2005-12-31 20:59:55 UTC (rev 985)
@@ -31,9 +31,9 @@
 
 <screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
 cp -arv include/asm-x86_64/* /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>
+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"




More information about the cross-lfs mailing list