r1695 - / trunk/BOOK trunk/BOOK/boot/common trunk/BOOK/boot/mips64 trunk/BOOK/boot/multilib trunk/BOOK/final-system/common trunk/BOOK/final-system/mips64 trunk/BOOK/final-system/multilib trunk/BOOK/introduction/common trunk/BOOK/materials/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue May 30 01:12:31 PDT 2006


Author: jim
Date: 2006-05-30 02:12:28 -0600 (Tue, 30 May 2006)
New Revision: 1695

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/boot/common/util-linux.xml
   trunk/BOOK/boot/mips64/util-linux.xml
   trunk/BOOK/boot/multilib/util-linux.xml
   trunk/BOOK/final-system/common/util-linux.xml
   trunk/BOOK/final-system/mips64/util-linux.xml
   trunk/BOOK/final-system/multilib/util-linux.xml
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/materials/common/patches.xml
   trunk/BOOK/patches.ent
Log:
 r3746 at server (orig r1747):  jim | 2006-05-30 01:08:18 -0700
  r3745 at server:  jim | 2006-05-30 01:06:16 -0700
  Added a patch to fix a missing declaration of R_OK in util-linux
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1746
   + b6734a72-470d-0410-b049-f317dca95413:/:1747


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:3732
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:3745
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/boot/common/util-linux.xml
===================================================================
--- trunk/BOOK/boot/common/util-linux.xml	2006-05-30 07:59:38 UTC (rev 1694)
+++ trunk/BOOK/boot/common/util-linux.xml	2006-05-30 08:12:28 UTC (rev 1695)
@@ -38,6 +38,14 @@
     href="../../final-system/common/util-linux.xml"
     xpointer="xpointer(//*[@os='p4'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p6'])"/>
+
     <para os="ba">Util-linux does not use the freshly installed headers and
     libraries from the <filename class="directory">/tools</filename>
     directory by default. This is fixed by altering the

Modified: trunk/BOOK/boot/mips64/util-linux.xml
===================================================================
--- trunk/BOOK/boot/mips64/util-linux.xml	2006-05-30 07:59:38 UTC (rev 1694)
+++ trunk/BOOK/boot/mips64/util-linux.xml	2006-05-30 08:12:28 UTC (rev 1695)
@@ -39,14 +39,22 @@
     xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/util-linux.xml"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='p5'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/util-linux.xml"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='p6'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips64/util-linux.xml"
+    xpointer="xpointer(//*[@os='mp1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips64/util-linux.xml"
+    xpointer="xpointer(//*[@os='mp2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 

Modified: trunk/BOOK/boot/multilib/util-linux.xml
===================================================================
--- trunk/BOOK/boot/multilib/util-linux.xml	2006-05-30 07:59:38 UTC (rev 1694)
+++ trunk/BOOK/boot/multilib/util-linux.xml	2006-05-30 08:12:28 UTC (rev 1695)
@@ -40,6 +40,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/common/util-linux.xml
===================================================================
--- trunk/BOOK/final-system/common/util-linux.xml	2006-05-30 07:59:38 UTC (rev 1694)
+++ trunk/BOOK/final-system/common/util-linux.xml	2006-05-30 08:12:28 UTC (rev 1695)
@@ -51,6 +51,11 @@
 
 <screen os="p4"><userinput>patch -Np1 -i ../&util-linux-gcc4_fixes-patch;</userinput></screen>
 
+    <para os="p5">The following patch fixes swapon.c, it tries to find the variable R_OK, but
+    the header that has R_OK is not included:</para>
+
+<screen os="p6"><userinput>patch -Np1 -i ../&util-linux-missing_header-patch;</userinput></screen>
+
     <para os="a">Prepare Util-linux for compilation:</para>
 
 <screen os="b"><userinput>./configure</userinput></screen>

Modified: trunk/BOOK/final-system/mips64/util-linux.xml
===================================================================
--- trunk/BOOK/final-system/mips64/util-linux.xml	2006-05-30 07:59:38 UTC (rev 1694)
+++ trunk/BOOK/final-system/mips64/util-linux.xml	2006-05-30 08:12:28 UTC (rev 1695)
@@ -41,10 +41,18 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='p4'])"/>
 
-    <para os="p5">Util-linux has a compilation error when built using 64bit
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p6'])"/>
+
+    <para os="mp1">Util-linux has a compilation error when built using 64bit
     and a MIPS processor. The follow patch addresses this error:</para>
 
-<screen os="p6"><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
+<screen os="mp2"><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"

Modified: trunk/BOOK/final-system/multilib/util-linux.xml
===================================================================
--- trunk/BOOK/final-system/multilib/util-linux.xml	2006-05-30 07:59:38 UTC (rev 1694)
+++ trunk/BOOK/final-system/multilib/util-linux.xml	2006-05-30 08:12:28 UTC (rev 1695)
@@ -43,6 +43,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-05-30 07:59:38 UTC (rev 1694)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-05-30 08:12:28 UTC (rev 1695)
@@ -37,6 +37,16 @@
 -->
 
     <listitem>
+      <para>May 30, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Added a patch to fix a missing declaration of R_OK
+                        in util-linux.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 29, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/materials/common/patches.xml
===================================================================
--- trunk/BOOK/materials/common/patches.xml	2006-05-30 07:59:38 UTC (rev 1694)
+++ trunk/BOOK/materials/common/patches.xml	2006-05-30 08:12:28 UTC (rev 1695)
@@ -260,6 +260,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Util-linux Missing Header Patch - <token>&util-linux-missing_header-patch-size;</token>:</term> <listitem>
+        <para>Download: <ulink
+        url="&patches-root;util-linux/&util-linux-missing_header-patch;"/></para>
+        <para>MD5 sum: <literal>&util-linux-missing_header-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Vim Fixes Patch - <token>&vim-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-05-30 07:59:38 UTC (rev 1694)
+++ trunk/BOOK/patches.ent	2006-05-30 08:12:28 UTC (rev 1695)
@@ -116,6 +116,10 @@
 <!ENTITY util-linux-gcc4_fixes-patch-md5 "6c030921dc9b92daf688f12a4ee6f6e0">
 <!ENTITY util-linux-gcc4_fixes-patch-size "1 KB">
 
+<!ENTITY util-linux-missing_header-patch "util-linux-&util-linux-version;-missing_header-1.patch">
+<!ENTITY util-linux-missing_header-patch-md5 "33ccc15d2e92caa6189b044f573fdcda">
+<!ENTITY util-linux-missing_header-patch-size "1 KB">
+
 <!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-3.patch">
 <!ENTITY vim-fixes-patch-md5 "ed158ebfb653b797b642fbff175addea">
 <!ENTITY vim-fixes-patch-size "20 KB">




More information about the cross-lfs mailing list