aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml15
-rw-r--r--chapter06/glibc.xml51
-rw-r--r--chapter06/vim.xml8
-rw-r--r--general.ent6
4 files changed, 70 insertions, 10 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index da54a8765..4bc0674af 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,21 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
+ <para>2017-05-03</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Fix a problem with glibc tests and
+ add some explanations to the configure options.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Add a command to touch /root/.vimrc
+ so that the default vim options don't override those
+ in /etc/vimrc.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2017-05-01</para>
<itemizedlist>
<listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 49775184a..5d2afcd81 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -78,11 +78,51 @@ cd build</userinput></screen>
<para>Prepare Glibc for compilation:</para>
<screen><userinput remap="configure">../configure --prefix=/usr \
+ --disable-werror \
--enable-kernel=&min-kernel; \
--enable-obsolete-rpc \
--enable-stack-protector=strong \
libc_cv_slibdir=/lib</userinput></screen>
+ <variablelist>
+ <title>The meaning of the new configure options:</title>
+
+ <varlistentry>
+ <term><parameter>--disable-werror</parameter></term>
+ <listitem>
+ <para>This option disables the -Werror option passed to
+ GCC. This is necessary for running the test suite.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>--enable-obsolete-rpc</parameter></term>
+ <listitem>
+ <para>This option builds older RPC code for use with
+ network file system utilities (nfs).</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>--enable-stack-protector=strong</parameter></term>
+ <listitem>
+ <para>This option increases system security by adding a known canary
+ (a random integer) to the stack during a function preamble, and checks
+ it when the function returns. If it changed, there was a stack
+ overflow, and the program aborts.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>libc_cv_slibdir=/lib</parameter></term>
+ <listitem>
+ <para>This variable sets the correct library for all
+ systems. We do not want lib64 to be used.</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+
<para>Compile the package:</para>
<screen><userinput remap="make">make</userinput></screen>
@@ -97,17 +137,16 @@ cd build</userinput></screen>
<screen><userinput remap="test">make check</userinput></screen>
- <para>You will probably see some test failures. The Glibc test suite is
+ <para>You may see some test failures. The Glibc test suite is
somewhat dependent on the host system. This is a list of the most common
- issues seen for this version of LFS:</para>
+ issues seen for some versions of LFS:</para>
<itemizedlist>
<listitem>
- <para><emphasis>posix/tst-getaddrinfo4</emphasis> will always fail due
- to not having the necessary networking applications when the tests are
- run. <emphasis>posix/tst-getaddrinfo5</emphasis> is also known
- to fail on some architectures.</para>
+ <para><emphasis>posix/tst-getaddrinfo4</emphasis> and
+ <emphasis>posix/tst-getaddrinfo5</emphasis>
+ may fail on some architectures.</para>
</listitem>
<listitem>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 6fa7f60f7..94672585a 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -128,7 +128,9 @@ endif
" End /etc/vimrc</literal>
-EOF</userinput></screen>
+EOF
+
+touch ~/.vimrc</userinput></screen>
<para>The <parameter>set nocompatible</parameter> setting makes
<command>vim</command> behave in a more useful way (the default) than the
@@ -144,6 +146,10 @@ EOF</userinput></screen>
emulators. This gives the highlighting a better color scheme for use on the
black background of these programs.</para>
+ <para>Creating an empty <filename>~/.vimrc</filename> prevents vim from
+ overriding settings in <filename>/etc/vimrc</filename> by using
+ <filename>/usr/share/vim/vim80/defaults.vim</filename>.</para>
+
<para>Documentation for other available options can be obtained by
running the following command:</para>
diff --git a/general.ent b/general.ent
index 2f15d2606..33ee3e7fb 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20170501">
+<!ENTITY version "SVN-20170503">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
-<!ENTITY versiond "20170501-systemd">
+<!ENTITY versiond "20170503-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "May 1, 2017">
+<!ENTITY releasedate "May 3, 2017">
<!ENTITY copyrightdate "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "8.1">