r6691 - in branches/cross-lfs/BOOK: . boot/x86_64 cross-tools/x86_64-64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Aug 15 12:37:27 PDT 2005


Author: jim
Date: 2005-08-15 13:37:27 -0600 (Mon, 15 Aug 2005)
New Revision: 6691

Modified:
   branches/cross-lfs/BOOK/
   branches/cross-lfs/BOOK/boot/x86_64/kernel.xml
   branches/cross-lfs/BOOK/cross-tools/x86_64-64/glibc.xml
Log:
 r7152 at server:  jim | 2005-08-15 12:34:21 -0700
 Fixed typo in reboot section kernel copying. Thanks to Matt Darcy



Property changes on: branches/cross-lfs/BOOK
___________________________________________________________________
Name: svk:merge
   - 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:7112
dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516
   + 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:7152
dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516

Modified: branches/cross-lfs/BOOK/boot/x86_64/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/x86_64/kernel.xml	2005-08-15 09:59:24 UTC (rev 6690)
+++ branches/cross-lfs/BOOK/boot/x86_64/kernel.xml	2005-08-15 19:37:27 UTC (rev 6691)
@@ -124,7 +124,7 @@
     href="../../bootable/x86_64/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp arch/i386${LFS}/boot/bzImage ${LFS}/boot/lfskernel-&linux-x86_64-version;</userinput></screen>
+<screen><userinput>cp arch/i386/boot/bzImage ${LFS}/boot/lfskernel-&linux-x86_64-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/x86_64/kernel.xml"

Modified: branches/cross-lfs/BOOK/cross-tools/x86_64-64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86_64-64/glibc.xml	2005-08-15 09:59:24 UTC (rev 6690)
+++ branches/cross-lfs/BOOK/cross-tools/x86_64-64/glibc.xml	2005-08-15 19:37:27 UTC (rev 6691)
@@ -79,8 +79,7 @@
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${LFS_TARGET} --build=${LFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
+    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
     --cache-file=config.cache</userinput></screen>
 




More information about the lfs-book mailing list