Author: krejzi
Date: Fri Jan 17 14:39:02 2014
New Revision: 10446
Log:
Merge latest lfs svn
Modified:
branches/systemd/BOOK/chapter01/changelog.xml
branches/systemd/BOOK/chapter06/chroot.xml
branches/systemd/BOOK/chapter06/gcc.xml
branches/systemd/BOOK/chapter06/inetutils.xml
branches/systemd/BOOK/chapter06/revisedchroot.xml
branches/systemd/BOOK/general.ent
branches/systemd/BOOK/packages.ent
Modified: branches/systemd/BOOK/chapter01/changelog.xml
==============================================================================
--- branches/systemd/BOOK/chapter01/changelog.xml Wed Jan 15 18:14:55
2014 (r10445)
+++ branches/systemd/BOOK/chapter01/changelog.xml Fri Jan 17 14:39:02
2014 (r10446)
@@ -36,6 +36,36 @@
</listitem>
-->
<listitem>
+ <para>2014-01-17</para>
+ <itemizedlist>
+ <listitem>
+ <para>[krejzi] - Merge LFS SVN-20140114 book.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>2014-01-14</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to inetutils-1.9.2 and remove
+ referece to old BLFS page. Fixes
+ <ulink url="&lfs-ticket-root;3471">#3471</ulink> and
+ <ulink url="&lfs-ticket-root;3473">#3473</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Fix hardcoded reference to /tools in
+ Chapter 6 glibc. Fixes
+ <ulink url="&lfs-ticket-root;3466">#3466</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Clean up /run and /tmp. Fixes
+ <ulink url="&lfs-ticket-root;3463">#3463</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2014-01-10</para>
<itemizedlist>
<listitem>
Modified: branches/systemd/BOOK/chapter06/chroot.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/chroot.xml Wed Jan 15 18:14:55 2014
(r10445)
+++ branches/systemd/BOOK/chapter06/chroot.xml Fri Jan 17 14:39:02 2014
(r10446)
@@ -15,7 +15,7 @@
class="username">root</systemitem>, run the following command to enter the
realm that is, at the moment, populated with only the temporary tools:</para>
-<screen><userinput>chroot "$LFS" /tools/bin/env -i \
+<screen role="nodump"><userinput>chroot "$LFS" /tools/bin/env -i \
HOME=/root \
TERM="$TERM" \
PS1='\u:\w\$ ' \
Modified: branches/systemd/BOOK/chapter06/gcc.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/gcc.xml Wed Jan 15 18:14:55 2014
(r10445)
+++ branches/systemd/BOOK/chapter06/gcc.xml Fri Jan 17 14:39:02 2014
(r10446)
@@ -70,7 +70,8 @@
<para>Prepare GCC for compilation:</para>
-<screen><userinput remap="configure">../gcc-&gcc-version;/configure
--prefix=/usr \
+<screen><userinput remap="configure">SED=sed
\
+../gcc-&gcc-version;/configure --prefix=/usr \
--libexecdir=/usr/lib \
--enable-shared \
--enable-threads=posix \
@@ -87,15 +88,15 @@
<variablelist>
<title>The meaning of the new configure option:</title>
-<!--
+
<varlistentry>
- <term><parameter>- -disable-install-libiberty</parameter></term>
+ <term><envar>SED=sed</envar></term>
<listitem>
- <para>This prevents GCC from installing its own copy of libiberty,
- which is already provided by Binutils-&binutils-version;.</para>
+ <para>Setting this environment variable prevents a hard-coded
+ path to /tools/bin/sed.</para>
</listitem>
</varlistentry>
--->
+
<varlistentry>
<term><parameter>--with-system-zlib</parameter></term>
<listitem>
Modified: branches/systemd/BOOK/chapter06/inetutils.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/inetutils.xml Wed Jan 15 18:14:55
2014 (r10445)
+++ branches/systemd/BOOK/chapter06/inetutils.xml Fri Jan 17 14:39:02
2014 (r10446)
@@ -40,16 +40,16 @@
<sect2 role="installation">
<title>Installation of Inetutils</title>
- <para>Fix an incompatibility between this package and
Glibc-&glibc-version;</para>
+ <para>Create a definition to allow the <command>ifconfig</command> program
+ to build properly.</para>
-<screen><userinput remap="pre">sed -i -e '/gets is a/d'
lib/stdio.in.h</userinput></screen>
+<screen><userinput remap="pre">echo '#define PATH_PROCNET_DEV "/proc/net/dev"'
>> ifconfig/system/linux.h </userinput></screen>
<para>Prepare Inetutils for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
--libexecdir=/usr/sbin \
--localstatedir=/var \
- --disable-ifconfig \
--disable-logger \
--disable-syslogd \
--disable-whois \
@@ -59,16 +59,6 @@
<title>The meaning of the configure options:</title>
<varlistentry>
- <term><parameter>--disable-ifconfig</parameter></term>
- <listitem>
- <para>This option prevents Inetutils from installing the
- <command>ifconfig</command> program, which can be used to configure
network
- interfaces. LFS uses <command>ip</command> from IPRoute2 to perform
- this task.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><parameter>--disable-logger</parameter></term>
<listitem>
<para>This option prevents Inetutils from installing the
@@ -101,8 +91,7 @@
<para>This disables the installation of the various network servers
included as part of the Inetutils package. These servers are deemed
not
appropriate in a basic LFS system. Some are insecure by nature and
are
- only considered safe on trusted networks. More information can be
found
- at <ulink url="&blfs-root;view/svn/basicnet/inetutils.html"/>. Note
that
+ only considered safe on trusted networks. Note that
better replacements are available for many of these servers.</para>
</listitem>
</varlistentry>
@@ -120,14 +109,12 @@
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>
-<!-- The html file generation is broken as of texinfo-5.0
-make -C doc html
-make -C doc install-html
docdir=/usr/share/doc/inetutils-&inetutils-version;</userinput></screen>
--->
+
<para>Move some programs so they are available if <filename
class='directory'>/usr</filename> is not accessible:</para>
-<screen><userinput remap="install">mv -v
/usr/bin/{hostname,ping,ping6,traceroute} /bin</userinput></screen>
+<screen><userinput remap="install">mv -v
/usr/bin/{hostname,ping,ping6,traceroute} /bin
+mv -v /usr/bin/ifconfig /sbin</userinput></screen>
</sect2>
@@ -138,8 +125,8 @@
<segtitle>Installed programs</segtitle>
<seglistitem>
- <seg>ftp, hostname, ping, ping6, rcp, rexec, rlogin, rsh, talk, telnet,
- tftp, and traceroute</seg>
+ <seg>ftp, ifconfig, hostname, ping, ping6, rcp, rexec, rlogin,
+ rsh, talk, telnet, tftp, and traceroute</seg>
</seglistitem>
</segmentedlist>
@@ -158,6 +145,16 @@
</listitem>
</varlistentry>
+ <varlistentry id="ifconfig">
+ <term><command>ifconfig</command></term>
+ <listitem>
+ <para>Manages network interfaces</para>
+ <indexterm zone="ch-system-inetutils ifconfig">
+ <primary sortas="b-ifconfig">ifconfig</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="hostname">
<term><command>hostname</command></term>
<listitem>
@@ -202,7 +199,7 @@
<varlistentry id="rexec">
<term><command>rexec</command></term>
<listitem>
- <para>executes commands on a remote host</para>
+ <para>Executes commands on a remote host</para>
<indexterm zone="ch-system-inetutils rexec">
<primary sortas="b-rexec">rexec</primary>
</indexterm>
Modified: branches/systemd/BOOK/chapter06/revisedchroot.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/revisedchroot.xml Wed Jan 15 18:14:55
2014 (r10445)
+++ branches/systemd/BOOK/chapter06/revisedchroot.xml Fri Jan 17 14:39:02
2014 (r10446)
@@ -10,12 +10,16 @@
<title>Cleaning Up</title>
+ <para>Finally, clean up some extra files left around from running
tests:</para>
+
+<screen><userinput>rm -rf /run/* /tmp/*</userinput></screen>
+
<para>From now on, when reentering the chroot environment after
exiting, use the following modified chroot command:</para>
-<screen><userinput>chroot "$LFS" /usr/bin/env -i \
+<screen role="nodump"><userinput>chroot "$LFS" /usr/bin/env -i \
HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
- PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+ PATH=/bin:/usr/bin:/sbin:/usr/sbin \
/bin/bash --login</userinput></screen>
<para>The reason for this is that the programs in <filename
@@ -31,6 +35,8 @@
instructions for this (see <ulink url="&blfs-root;"/>).</para>
</note>
+<screen role="nodump"><userinput>rm -rf /tools</userinput></screen>
+
<para>If the virtual kernel file systems have been unmounted, either manually
or through a reboot, ensure that the virtual kernel file systems are mounted
when reentering the chroot. This process was explained in <xref
Modified: branches/systemd/BOOK/general.ent
==============================================================================
--- branches/systemd/BOOK/general.ent Wed Jan 15 18:14:55 2014 (r10445)
+++ branches/systemd/BOOK/general.ent Fri Jan 17 14:39:02 2014 (r10446)
@@ -1,5 +1,5 @@
-<!ENTITY version "SYSTEMD-20140110">
-<!ENTITY releasedate "January 10, 2014">
+<!ENTITY version "SYSTEMD-20140117">
+<!ENTITY releasedate "January 17, 2014">
<!ENTITY copyrightdate "1999-2014"><!-- jhalfs needs a literal dash, not
– -->
<!ENTITY milestone "7.5">
<!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or
"x.y[-pre{x}]" -->
Modified: branches/systemd/BOOK/packages.ent
==============================================================================
--- branches/systemd/BOOK/packages.ent Wed Jan 15 18:14:55 2014 (r10445)
+++ branches/systemd/BOOK/packages.ent Fri Jan 17 14:39:02 2014 (r10446)
@@ -310,10 +310,10 @@
<!ENTITY iana-etc-ch6-du "2.2 MB">
<!ENTITY iana-etc-ch6-sbu "less than 0.1 SBU">
-<!ENTITY inetutils-version "1.9.1">
-<!ENTITY inetutils-size "1,941 KB">
+<!ENTITY inetutils-version "1.9.2">
+<!ENTITY inetutils-size "2,188 KB">
<!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.gz">
-<!ENTITY inetutils-md5 "944f7196a2b3dba2d400e9088576000c">
+<!ENTITY inetutils-md5 "aa1a9a132259db83e66c1f3265065ba2">
<!ENTITY inetutils-home "&gnu-software;inetutils/">
<!ENTITY inetutils-ch6-du "27 MB">
<!ENTITY inetutils-ch6-sbu "0.4 SBU">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
