Author: jim
Date: 2005-07-06 20:32:34 -0600 (Wed, 06 Jul 2005)
New Revision: 6429
Modified:
branches/cross-lfs/BOOK/
branches/cross-lfs/BOOK/cross-tools/sparc/linux-libc-headers.xml
branches/cross-lfs/BOOK/cross-tools/sparc64/linux-libc-headers.xml
branches/cross-lfs/BOOK/final-system/sparc/linux-libc-headers.xml
branches/cross-lfs/BOOK/final-system/sparc64/linux-libc-headers.xml
branches/cross-lfs/BOOK/patches.ent
branches/cross-lfs/BOOK/temp-system/multilib/gawk.xml
Log:
[EMAIL PROTECTED]: jim | 2005-07-06 18:15:58 -0700
Removed uneeded patch from sparc, fixed in 2.6.12.0 headers
Property changes on: branches/cross-lfs/BOOK
___________________________________________________________________
Name: svk:merge
- 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:6761
dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516
+ 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:6762
dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516
Modified: branches/cross-lfs/BOOK/cross-tools/sparc/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc/linux-libc-headers.xml
2005-07-07 02:32:17 UTC (rev 6428)
+++ branches/cross-lfs/BOOK/cross-tools/sparc/linux-libc-headers.xml
2005-07-07 02:32:34 UTC (rev 6429)
@@ -43,10 +43,6 @@
<sect2 role="installation">
<title>Installation of Linux-Libc-Headers</title>
- <para>The following patch fixes compile issues with silo:</para>
-
-<screen><userinput>patch -Np1 -i
../&linux-libc-headers-sparc_conflicts-patch;</userinput></screen>
-
<para>Install the header files:</para>
<screen><userinput>install -d /tools/include
Modified: branches/cross-lfs/BOOK/cross-tools/sparc64/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc64/linux-libc-headers.xml
2005-07-07 02:32:17 UTC (rev 6428)
+++ branches/cross-lfs/BOOK/cross-tools/sparc64/linux-libc-headers.xml
2005-07-07 02:32:34 UTC (rev 6429)
@@ -48,10 +48,6 @@
<screen><userinput>patch -Np1 -i
../&linux-libc-headers-sparc_biarch-patch;</userinput></screen>
- <para>The following patch fixes compile issues with silo:</para>
-
-<screen><userinput>patch -Np1 -i
../&linux-libc-headers-sparc_conflicts-patch;</userinput></screen>
-
<para>Install the header files:</para>
<screen><userinput>install -d /tools/include
Modified: branches/cross-lfs/BOOK/final-system/sparc/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc/linux-libc-headers.xml
2005-07-07 02:32:17 UTC (rev 6428)
+++ branches/cross-lfs/BOOK/final-system/sparc/linux-libc-headers.xml
2005-07-07 02:32:34 UTC (rev 6429)
@@ -27,10 +27,6 @@
href="../x86/linux-libc-headers.xml"
xpointer="xpointer(id('install-linux-libc-headers')/para[1])"/>
- <para>The following patch fixes compile issues with silo:</para>
-
-<screen><userinput>patch -Np1 -i
../&linux-libc-headers-sparc_conflicts-patch;</userinput></screen>
-
<para>Install the header files:</para>
<screen><userinput>cp -R include/asm-sparc /usr/include/asm
Modified: branches/cross-lfs/BOOK/final-system/sparc64/linux-libc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/linux-libc-headers.xml
2005-07-07 02:32:17 UTC (rev 6428)
+++ branches/cross-lfs/BOOK/final-system/sparc64/linux-libc-headers.xml
2005-07-07 02:32:34 UTC (rev 6429)
@@ -34,10 +34,6 @@
<screen><userinput>patch -Np1 -i
../&linux-libc-headers-sparc_biarch-patch;</userinput></screen>
- <para>The following patch fixes compile issues with silo:</para>
-
-<screen><userinput>patch -Np1 -i
../&linux-libc-headers-sparc_conflicts-patch;</userinput></screen>
-
<para>Install the header files:</para>
<screen><userinput>install -d /usr/include
Modified: branches/cross-lfs/BOOK/patches.ent
===================================================================
--- branches/cross-lfs/BOOK/patches.ent 2005-07-07 02:32:17 UTC (rev 6428)
+++ branches/cross-lfs/BOOK/patches.ent 2005-07-07 02:32:34 UTC (rev 6429)
@@ -55,7 +55,6 @@
<!-- Start of sparc/sparc64 patches -->
<!ENTITY linux-libc-headers-sparc_biarch-patch
"linux-libc-headers-&linux-libc-headers-sparc64-version;-sparc_biarch-1.patch">
-<!ENTITY linux-libc-headers-sparc_conflicts-patch
"linux-libc-headers-&linux-libc-headers-sparc64-version;-sparc_conflicts-1.patch">
<!ENTITY kbd-sparc_kbdrate-patch "kbd-&kbd-version;-sparc_kbdrate-1.patch">
Modified: branches/cross-lfs/BOOK/temp-system/multilib/gawk.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/gawk.xml 2005-07-07
02:32:17 UTC (rev 6428)
+++ branches/cross-lfs/BOOK/temp-system/multilib/gawk.xml 2005-07-07
02:32:34 UTC (rev 6429)
@@ -53,10 +53,6 @@
<screen><userinput>make</userinput></screen>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/gawk.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'installation']/variablelist[1])"/>
-
<para>Install the package:</para>
<screen><userinput>make install</userinput></screen>
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
