r5356 - in branches/cross-lfs/BOOK/reboot: . common multilib

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Fri May 13 13:50:47 PDT 2005


Author: jhuntwork
Date: 2005-05-13 14:50:42 -0600 (Fri, 13 May 2005)
New Revision: 5356

Added:
   branches/cross-lfs/BOOK/reboot/multilib/util-linux.xml
Modified:
   branches/cross-lfs/BOOK/reboot/common/util-linux.xml
   branches/cross-lfs/BOOK/reboot/sparc64-chapter.xml
Log:
Added cramfs patch to reboot util-linux and made a multilib version

Modified: branches/cross-lfs/BOOK/reboot/common/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/common/util-linux.xml	2005-05-13 20:29:24 UTC (rev 5355)
+++ branches/cross-lfs/BOOK/reboot/common/util-linux.xml	2005-05-13 20:50:42 UTC (rev 5356)
@@ -36,6 +36,11 @@
 
 <screen><userinput>sed -i 's@/usr/include@/tools/include at g' configure</userinput></screen>
 
+<para>Util-linux has a compilation error against newer versions of the
+linux-libc-headers.  The following patch properly fixes that issue</para>
+
+<screen><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
+
 <para>Prepare Util-linux for compilation:</para>
 
 <screen><userinput>./configure</userinput></screen>
@@ -44,9 +49,12 @@
 
 <screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no CPUOPT="" ARCH="" CPU=""</userinput></screen>
 
-<para>Install the package:</para>
+<para>Install the package as root:</para>
 
-<screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no CPUOPT="" ARCH="" CPU="" DESTDIR=${LFS} install</userinput></screen>
+<screen><userinput>exit
+cd ${LFS}/sources/util-linux-&util-linux-version;
+make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no CPUOPT="" ARCH="" CPU="" DESTDIR=${LFS} install
+su - lfs</userinput></screen>
 
 </sect2>
 

Copied: branches/cross-lfs/BOOK/reboot/multilib/util-linux.xml (from rev 5349, branches/cross-lfs/BOOK/reboot/common/util-linux.xml)
===================================================================
--- branches/cross-lfs/BOOK/reboot/common/util-linux.xml	2005-05-13 19:08:47 UTC (rev 5349)
+++ branches/cross-lfs/BOOK/reboot/multilib/util-linux.xml	2005-05-13 20:50:42 UTC (rev 5356)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../../patches.ent">
+  %general-entities;
+  %patches-entities;
+]>
+
+<sect1 id="ch-reboot-util-linux" role="wrap">
+<title>Util-linux-&util-linux-version;</title>
+<?dbhtml filename="util-linux.html"?>
+
+<indexterm zone="ch-reboot-util-linux">
+<primary sortas="a-Util-linux">Util-linux</primary>
+<secondary>reboot</secondary></indexterm>
+
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../final-system/common/util-linux.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>16 MB</seg></seglistitem>
+</segmentedlist>
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../final-system/common/util-linux.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+
+</sect2>
+
+<sect2 role="installation">
+<title>Installation of Util-linux</title>
+
+<para>Util-linux does not use the freshly installed headers and
+libraries from the <filename class="directory">/tools</filename>
+directory. This is fixed by altering the configure script:</para>
+
+<screen><userinput>sed -i 's@/usr/include@/tools/include at g' configure</userinput></screen>
+
+<para>Util-linux has a compilation error against newer versions of the
+linux-libc-headers.  The following patch properly fixes that issue</para>
+
+<screen><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
+
+<para>Util-Linux needs the CC variable set to include the Build flags:</para>
+
+<screen><userinput>export CC="${LFS_TARGET}-gcc ${BUILD64}"</userinput></screen>
+
+<para>Prepare Util-linux for compilation:</para>
+
+<screen><userinput>./configure</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no CPUOPT="" ARCH="" CPU=""</userinput></screen>
+
+<para>Install the package as root:</para>
+
+<screen><userinput>exit
+cd ${LFS}/sources/util-linux-&util-linux-version;
+make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no CPUOPT="" ARCH="" CPU="" DESTDIR=${LFS} install
+su - lfs</userinput></screen>
+
+</sect2>
+
+<sect2 role="content"><title/>
+<para>Details on this package are located in <xref
+linkend="contents-util-linux" role="."/></para>
+</sect2>
+</sect1>
+

Modified: branches/cross-lfs/BOOK/reboot/sparc64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/sparc64-chapter.xml	2005-05-13 20:29:24 UTC (rev 5355)
+++ branches/cross-lfs/BOOK/reboot/sparc64-chapter.xml	2005-05-13 20:50:42 UTC (rev 5356)
@@ -12,7 +12,7 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>




More information about the lfs-book mailing list