r984 - 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 11:16:02 PST 2005


Author: jim
Date: 2005-12-31 12:16:01 -0700 (Sat, 31 Dec 2005)
New Revision: 984

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:
 r1237 at server:  jim | 2005-12-31 09:39:39 -0800
 Updated ken's patch to be consistant with all headers



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1229
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1237
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:15:03 UTC (rev 983)
+++ trunk/BOOK/final-system/alpha/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
@@ -29,11 +29,11 @@
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<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>
+<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>
 
     <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:15:03 UTC (rev 983)
+++ trunk/BOOK/final-system/mips/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
@@ -37,11 +37,11 @@
 
 <screen os="md"><userinput>patch -Np1 -i ../&linux-libc-headers-mips_atomic_fix-patch;</userinput></screen>
 
-<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>
+<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>
 
     <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:15:03 UTC (rev 983)
+++ trunk/BOOK/final-system/ppc/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
@@ -29,11 +29,11 @@
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<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>
+<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>
 
     <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:15:03 UTC (rev 983)
+++ trunk/BOOK/final-system/sparc/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
@@ -33,11 +33,11 @@
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<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>
+<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/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/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/final-system/sparc64/linux-libc-headers.xml	2005-12-31 19:15:03 UTC (rev 983)
+++ trunk/BOOK/final-system/sparc64/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
@@ -42,13 +42,13 @@
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<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/linux /usr/include
-cp -R include/mtd /usr/include
-cp -R include/scsi /usr/include</userinput></screen>
+<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-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>
 
     <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:15:03 UTC (rev 983)
+++ trunk/BOOK/final-system/sparc64-64/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
@@ -37,11 +37,11 @@
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<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>
+<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>
 
     <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:15:03 UTC (rev 983)
+++ trunk/BOOK/final-system/x86/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
@@ -43,11 +43,11 @@
 
     <para os="b">Install the header files:</para>
 
-<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>
+<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>
 
     <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:15:03 UTC (rev 983)
+++ trunk/BOOK/final-system/x86_64/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
@@ -34,13 +34,13 @@
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<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/linux /usr/include
-cp -R include/mtd /usr/include
-cp -R include/scsi /usr/include</userinput></screen>
+<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-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>
 
     <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:15:03 UTC (rev 983)
+++ trunk/BOOK/final-system/x86_64-64/linux-libc-headers.xml	2005-12-31 19:16:01 UTC (rev 984)
@@ -29,11 +29,11 @@
     href="../x86/linux-libc-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<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>
+<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>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-libc-headers.xml"




More information about the cross-lfs mailing list