Author: bdubbs
Date: Fri Feb 28 22:00:12 2014
New Revision: 12801
Log:
Added a patch to avoid net-tools from overwriting LFS versions of
ifconfig and hostname.
Tag a few more files.
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/networking/netprogs/net-tools.xml
trunk/BOOK/xsoft/other/balsa.xml
trunk/BOOK/xsoft/other/rox-filer.xml
trunk/BOOK/xsoft/other/xchat.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Fri Feb 28 15:16:23 2014 (r12800)
+++ trunk/BOOK/general.ent Fri Feb 28 22:00:12 2014 (r12801)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "27"> <!-- Always 2 digits -->
-<!ENTITY month "02"> <!-- Always 2 digits -->
+<!ENTITY day "01"> <!-- Always 2 digits -->
+<!ENTITY month "03"> <!-- Always 2 digits -->
<!ENTITY year "2014">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "February 27th, &year;">
+<!ENTITY releasedate "March 1st, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!--
version|testing|unstable|development] -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Fri Feb 28 15:16:23
2014 (r12800)
+++ trunk/BOOK/introduction/welcome/changelog.xml Fri Feb 28 22:00:12
2014 (r12801)
@@ -45,6 +45,17 @@
-->
<listitem>
+ <para>March 1st, 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Add a patch to remove ifconfig and hostname
+ when installing net-tools. Fixes
+ <ulink url="&blfs-ticket-root;4720">#4720</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>February 27th, 2014</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/networking/netprogs/net-tools.xml
==============================================================================
--- trunk/BOOK/networking/netprogs/net-tools.xml Fri Feb 28 15:16:23
2014 (r12800)
+++ trunk/BOOK/networking/netprogs/net-tools.xml Fri Feb 28 22:00:12
2014 (r12801)
@@ -57,6 +57,17 @@
</listitem>
</itemizedlist>
+ <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+ <itemizedlist spacing="compact">
+ <listitem>
+ <para>
+ Required patch:
+ <ulink
url="&patch-root;/net-tools-&net-tools-version;-remove_dups-1.patch"/>
+ </para>
+ </listitem>
+ </itemizedlist>
+
+
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/net-tools"/></para>
@@ -65,19 +76,6 @@
<sect2 role="installation">
<title>Installation of Net-tools</title>
- <note>
- <para>The <application>Net-tools</application> package installs a
- <command>hostname</command> program which will overwrite the existing
- program installed by <application>Inetutils</application> during a base
- LFS installation. If, for whatever reason, you need to reinstall the
- <application>Inetutils</application> package after installing
- <application>Net-tools</application>, you should add
- <command>--disable-hostname</command> to the Inetutils
- <command>configure</command> command in LFS if you wish to preserve the
- <application>Net-tools</application> <command>hostname</command>
- program.</para>
- </note>
-
<para id="net-tools-automate-example" xreflabel="Net-tools">The
instructions below automate the configuration process by piping
<command>yes</command> to the <command>make config</command> command. If
@@ -98,12 +96,16 @@
question interactively. The minimum needed options are 'UNIX protocol
family' and 'INET (TCP/IP) protocol family'.</para></note>
+ <para>The patch below cleans up the installation so that it does not
+ overwrite the <application>ifconfig</application> and
+ <application>hostname</application> programs that were installed in
LFS.</para>
+
<para>Install <application>Net-tools</application> by running the
following commands:</para>
-<screen><userinput>sed -i -e '/Token/s/y$/n/' config.in &&
-sed -i -e '/HAVE_HWSTRIP/s/y$/n/' config.in &&
-yes "" | make config &&
+<screen><userinput>patch -Np1 -i
../net-tools-&net-tools-version;-remove_dups-1.patch &&
+
+yes "" | make config &&
make</userinput></screen>
<para>This package does not come with a test suite.</para>
@@ -116,7 +118,7 @@
<sect2 role="commands">
<title>Command Explanations</title>
-
+<!--
<para><command>sed -i -e '/Token/s/y$/n/' config.in</command>: Change the
default for building obsolete token ring support to no. This is a
simpler change than changing the location for the token ring headers.
@@ -125,7 +127,7 @@
<para><command>sed -i -e '/HAVE_HWSTRIP/s/y$/n/' config.in</command>:
Removes obsolete Metricom radio support that requires a header no longer
included in the kernel. </para>
-
+-->
<para><command>yes "" | make config</command>: Piping
<command>yes</command>
to <command>make config</command> skips the interactive configuration and
accepts the defaults.</para>
@@ -141,10 +143,10 @@
<segtitle>Installed Directories</segtitle>
<seglistitem>
- <seg>arp, dnsdomainname, domainname, hostname,
- ifconfig, ipmaddr, iptunnel, mii-tool, nameif, netstat,
- nisdomainname, plipconfig, rarp, route, slattach, and
- ypdomainname</seg>
+ <seg>arp,
+ ipmaddr, iptunnel, mii-tool, nameif, netstat,
+ plipconfig, rarp, route, and slattach
+ </seg>
<seg>None</seg>
<seg>None</seg>
</seglistitem>
@@ -165,7 +167,7 @@
</indexterm>
</listitem>
</varlistentry>
-
+<!--
<varlistentry id="dnsdomainname">
<term><command>dnsdomainname</command></term>
<listitem>
@@ -205,7 +207,7 @@
</indexterm>
</listitem>
</varlistentry>
-
+-->
<varlistentry id="ipmaddr">
<term><command>ipmaddr</command></term>
<listitem>
@@ -257,7 +259,7 @@
</indexterm>
</listitem>
</varlistentry>
-
+<!--
<varlistentry id="nisdomainname">
<term><command>nisdomainname</command></term>
<listitem>
@@ -267,7 +269,7 @@
</indexterm>
</listitem>
</varlistentry>
-
+-->
<varlistentry id="plipconfig">
<term><command>plipconfig</command></term>
<listitem>
@@ -309,7 +311,7 @@
</indexterm>
</listitem>
</varlistentry>
-
+<!--
<varlistentry id="ypdomainname">
<term><command>ypdomainname</command></term>
<listitem>
@@ -319,7 +321,7 @@
</indexterm>
</listitem>
</varlistentry>
-
+-->
</variablelist>
</sect2>
Modified: trunk/BOOK/xsoft/other/balsa.xml
==============================================================================
--- trunk/BOOK/xsoft/other/balsa.xml Fri Feb 28 15:16:23 2014 (r12800)
+++ trunk/BOOK/xsoft/other/balsa.xml Fri Feb 28 22:00:12 2014 (r12801)
@@ -32,7 +32,7 @@
<para>The <application>Balsa</application> package contains a
<application>GNOME</application>-2 based mail client.</para>
- &lfs74_checked;
+ &lfs75_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -110,7 +110,6 @@
<screen><userinput>sed -i "/(HAVE_CONFIG_H)/i \
#include <glib-2.0/glib.h>" src/main-window.c &&
-
./configure --prefix=/usr \
--sysconfdir=/etc/gnome \
--localstatedir=/var/lib \
Modified: trunk/BOOK/xsoft/other/rox-filer.xml
==============================================================================
--- trunk/BOOK/xsoft/other/rox-filer.xml Fri Feb 28 15:16:23 2014
(r12800)
+++ trunk/BOOK/xsoft/other/rox-filer.xml Fri Feb 28 22:00:12 2014
(r12801)
@@ -35,7 +35,7 @@
manager.
</para>
- &lfs74_checked;
+ &lfs75_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -116,10 +116,10 @@
<screen><userinput>cd ROX-Filer
&&
sed -i 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":' src/main.c &&
-mkdir build &&
-pushd build &&
-../src/configure LIBS="-lm -ldl" &&
-make &&
+mkdir build &&
+pushd build &&
+ ../src/configure LIBS="-lm -ldl" &&
+ make &&
popd</userinput></screen>
<para>
Modified: trunk/BOOK/xsoft/other/xchat.xml
==============================================================================
--- trunk/BOOK/xsoft/other/xchat.xml Fri Feb 28 15:16:23 2014 (r12800)
+++ trunk/BOOK/xsoft/other/xchat.xml Fri Feb 28 22:00:12 2014 (r12801)
@@ -34,7 +34,7 @@
publicly, have private one-on-one conversations, etc. File transfers are
also possible.</para>
- &lfs74_checked;
+ &lfs75_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
