Author: jim
Date: 2005-09-25 17:35:06 -0600 (Sun, 25 Sep 2005)
New Revision: 6896
Modified:
branches/cross-lfs/BOOK/
branches/cross-lfs/BOOK/boot/64/util-linux.xml
branches/cross-lfs/BOOK/boot/common/util-linux.xml
branches/cross-lfs/BOOK/boot/mips64/util-linux.xml
branches/cross-lfs/BOOK/boot/multilib/util-linux.xml
branches/cross-lfs/BOOK/final-system/common/util-linux.xml
branches/cross-lfs/BOOK/final-system/mips64/util-linux.xml
branches/cross-lfs/BOOK/final-system/multilib/util-linux.xml
branches/cross-lfs/BOOK/general.ent
branches/cross-lfs/BOOK/introduction/common/changelog.xml
branches/cross-lfs/BOOK/introduction/common/whatsnew.xml
branches/cross-lfs/BOOK/materials/common/patches.xml
branches/cross-lfs/BOOK/patches.ent
Log:
[EMAIL PROTECTED]: jim | 2005-09-25 16:31:34 -0700
Updated to util-linux 2.12r
Property changes on: branches/cross-lfs/BOOK
___________________________________________________________________
Name: svk:merge
- 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:7487
dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516
+ 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:7488
dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516
Modified: branches/cross-lfs/BOOK/boot/64/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/64/util-linux.xml 2005-09-25 23:34:54 UTC
(rev 6895)
+++ branches/cross-lfs/BOOK/boot/64/util-linux.xml 2005-09-25 23:35:06 UTC
(rev 6896)
@@ -61,14 +61,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../common/util-linux.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'b3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/util-linux.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'b4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/util-linux.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'ba'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
Modified: branches/cross-lfs/BOOK/boot/common/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/common/util-linux.xml 2005-09-25 23:34:54 UTC
(rev 6895)
+++ branches/cross-lfs/BOOK/boot/common/util-linux.xml 2005-09-25 23:35:06 UTC
(rev 6896)
@@ -59,14 +59,6 @@
href="../../final-system/common/util-linux.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'b2'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../../final-system/common/util-linux.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'b3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../../final-system/common/util-linux.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'b4'])"/>
-
<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 configure
script:</para>
Modified: branches/cross-lfs/BOOK/boot/mips64/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips64/util-linux.xml 2005-09-25 23:34:54 UTC
(rev 6895)
+++ branches/cross-lfs/BOOK/boot/mips64/util-linux.xml 2005-09-25 23:35:06 UTC
(rev 6896)
@@ -60,14 +60,6 @@
xpointer="xpointer(//[EMAIL PROTECTED]'b2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/util-linux.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'b3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/util-linux.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'b4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../../final-system/mips64/util-linux.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'aa'])"/>
Modified: branches/cross-lfs/BOOK/boot/multilib/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/multilib/util-linux.xml 2005-09-25
23:34:54 UTC (rev 6895)
+++ branches/cross-lfs/BOOK/boot/multilib/util-linux.xml 2005-09-25
23:35:06 UTC (rev 6896)
@@ -61,14 +61,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../common/util-linux.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'b3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/util-linux.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'b4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/util-linux.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'ba'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
Modified: branches/cross-lfs/BOOK/final-system/common/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/util-linux.xml 2005-09-25
23:34:54 UTC (rev 6895)
+++ branches/cross-lfs/BOOK/final-system/common/util-linux.xml 2005-09-25
23:35:06 UTC (rev 6896)
@@ -71,10 +71,6 @@
<screen os="b2"><userinput>patch -Np1 -i
../&util-linux-gcc4_fixes-patch;</userinput></screen>
- <para os="b3">The following patch fixes a segfault in cfdisk:</para>
-
-<screen os="b4"><userinput>patch -Np1 -i
../&util-linux-reiser_crash-patch;</userinput></screen>
-
<para os="c">Prepare Util-linux for compilation:</para>
<screen><userinput>./configure</userinput></screen>
Modified: branches/cross-lfs/BOOK/final-system/mips64/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/util-linux.xml 2005-09-25
23:34:54 UTC (rev 6895)
+++ branches/cross-lfs/BOOK/final-system/mips64/util-linux.xml 2005-09-25
23:35:06 UTC (rev 6896)
@@ -60,14 +60,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../common/util-linux.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'b3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/util-linux.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'b4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/util-linux.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
<para os="aa">Util-linux has a compilation error when built using 64bit
Modified: branches/cross-lfs/BOOK/final-system/multilib/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/util-linux.xml
2005-09-25 23:34:54 UTC (rev 6895)
+++ branches/cross-lfs/BOOK/final-system/multilib/util-linux.xml
2005-09-25 23:35:06 UTC (rev 6896)
@@ -64,14 +64,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../common/util-linux.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'b3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/util-linux.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'b4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/util-linux.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
<screen><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
Modified: branches/cross-lfs/BOOK/general.ent
===================================================================
--- branches/cross-lfs/BOOK/general.ent 2005-09-25 23:34:54 UTC (rev 6895)
+++ branches/cross-lfs/BOOK/general.ent 2005-09-25 23:35:06 UTC (rev 6896)
@@ -109,7 +109,7 @@
<!ENTITY tar-version "1.15.1">
<!ENTITY tcl-version "8.4.11">
<!ENTITY texinfo-version "4.8">
-<!ENTITY util-linux-version "2.12q">
+<!ENTITY util-linux-version "2.12r">
<!ENTITY udev-version "070">
<!ENTITY udev-config-file "udev-config-2.rules">
<!ENTITY yaboot-version "1.3.13">
Modified: branches/cross-lfs/BOOK/introduction/common/changelog.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/common/changelog.xml 2005-09-25
23:34:54 UTC (rev 6895)
+++ branches/cross-lfs/BOOK/introduction/common/changelog.xml 2005-09-25
23:35:06 UTC (rev 6896)
@@ -39,6 +39,15 @@
-->
<listitem>
+ <para>September 25, 2005</para>
+ <itemizedlist>
+ <listitem>
+ <para>[jim] - Updated to Util-Linux 2.12r.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>September 21, 2005</para>
<itemizedlist>
<listitem>
Modified: branches/cross-lfs/BOOK/introduction/common/whatsnew.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/common/whatsnew.xml 2005-09-25
23:34:54 UTC (rev 6895)
+++ branches/cross-lfs/BOOK/introduction/common/whatsnew.xml 2005-09-25
23:35:06 UTC (rev 6896)
@@ -161,9 +161,6 @@
<para>&util-linux-cramfs-patch;</para>
</listitem>
<listitem>
- <para>&util-linux-reiser_crash-patch;</para>
- </listitem>
- <listitem>
<para>&vim-security_fix-patch;</para>
</listitem>
</itemizedlist>
@@ -172,6 +169,9 @@
<title>Removed:</title>
<listitem>
+ <para>util-linux-2.12q-reiser_crash-2.patch</para>
+ </listitem>
+ <listitem>
<para>shadow-4.0.7-fix_lastlog-1.patch</para>
</listitem>
<listitem>
Modified: branches/cross-lfs/BOOK/materials/common/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/common/patches.xml 2005-09-25
23:34:54 UTC (rev 6895)
+++ branches/cross-lfs/BOOK/materials/common/patches.xml 2005-09-25
23:35:06 UTC (rev 6896)
@@ -219,13 +219,6 @@
</varlistentry>
<varlistentry>
- <term>Util-linux Reiser Crash Patch - 1 KB:</term> <listitem>
- <para><ulink
- url="&patches-root;util-linux/&util-linux-reiser_crash-patch;"/></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>Vim Security Patch - 9 KB:</term><listitem>
<para><ulink url="&patches-root;vim/&vim-security_fix-patch;"/></para>
</listitem>
Modified: branches/cross-lfs/BOOK/patches.ent
===================================================================
--- branches/cross-lfs/BOOK/patches.ent 2005-09-25 23:34:54 UTC (rev 6895)
+++ branches/cross-lfs/BOOK/patches.ent 2005-09-25 23:35:06 UTC (rev 6896)
@@ -46,7 +46,6 @@
<!ENTITY util-linux-cramfs-patch
"util-linux-&util-linux-version;-cramfs-1.patch">
<!ENTITY util-linux-gcc4_fixes-patch
"util-linux-&util-linux-version;-gcc4_fixes-1.patch">
-<!ENTITY util-linux-reiser_crash-patch
"util-linux-&util-linux-version;-reiser_crash-2.patch">
<!ENTITY vim-security_fix-patch "vim-&vim-version;-security_fix-2.patch">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
