Author: bdubbs
Date: Fri Jul 6 12:02:39 2018
New Revision: 11432
Log:
Make symbolic links in inital part of Chapter 6 consistent
for all versions of the book. Allows removing environment
variables no longer needed with e2fsprogs.
Modified:
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter06/createfiles.xml
trunk/BOOK/chapter06/e2fsprogs.xml
trunk/BOOK/general.ent
Modified: trunk/BOOK/chapter01/changelog.xml
==============================================================================
--- trunk/BOOK/chapter01/changelog.xml Wed Jul 4 14:16:15 2018 (r11431)
+++ trunk/BOOK/chapter01/changelog.xml Fri Jul 6 12:02:39 2018 (r11432)
@@ -47,6 +47,18 @@
<para>2018-07-03</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Make symbolic links in inital part of
+ Chapter 6 consistent for all versions of the book. Allows
+ removing environment variables no longer needed with e2fsprogs.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>2018-07-03</para>
+ <itemizedlist>
+ <listitem>
<para>[bdubbs] - Update to attr-2.4.48. Fixes
<ulink url="&lfs-ticket-root;4308">#4308</ulink>.</para>
</listitem>
Modified: trunk/BOOK/chapter06/createfiles.xml
==============================================================================
--- trunk/BOOK/chapter06/createfiles.xml Wed Jul 4 14:16:15 2018
(r11431)
+++ trunk/BOOK/chapter06/createfiles.xml Fri Jul 6 12:02:39 2018
(r11432)
@@ -39,15 +39,20 @@
will be replaced by real files throughout the course of this chapter after
the
software has been installed:</para>
+<!--
<screen revision="sysv"><userinput>ln -sv
/tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
ln -sv /tools/bin/{install,perl} /usr/bin
ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
-ln -sv bash /bin/sh</userinput></screen>
+ln -sv bash /bin/sh
+
+</userinput></screen>
+-->
<!--sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la -->
-<screen revision="systemd"><userinput>ln -sv
/tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
+<!--<screen revision="systemd"><userinput>ln -sv
/tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin-->
+<screen><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
ln -sv /tools/bin/{env,install,perl} /usr/bin
ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
@@ -176,10 +181,11 @@
</listitem>
</varlistentry>
-->
- <varlistentry revision="systemd">
+ <!--<varlistentry revision="systemd">-->
+ <varlistentry>
<term><parameter><filename>/usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*}</filename></parameter></term>
<listitem>
- <para>These links prevent systemd utilities from acquiring an
+ <para>These links prevent <!--systemd--> utilities from acquiring an
unnecessary reference to the
<filename class="directory">/tools</filename> directory.</para>
</listitem>
Modified: trunk/BOOK/chapter06/e2fsprogs.xml
==============================================================================
--- trunk/BOOK/chapter06/e2fsprogs.xml Wed Jul 4 14:16:15 2018 (r11431)
+++ trunk/BOOK/chapter06/e2fsprogs.xml Fri Jul 6 12:02:39 2018 (r11432)
@@ -52,10 +52,12 @@
<para>Prepare E2fsprogs for compilation:</para>
-<screen><userinput remap="configure">LIBS=-L/tools/lib \
+<!--<screen><userinput remap="configure">LIBS=-L/tools/lib \
+CFLAGS=-I/tools/include \
CFLAGS=-I/tools/include \
PKG_CONFIG_PATH=/tools/lib/pkgconfig \
-../configure --prefix=/usr \
+../configure - -prefix=/usr \-->
+<screen><userinput remap="configure">../configure --prefix=/usr \
--bindir=/bin \
--with-root-prefix="" \
--enable-elf-shlibs \
@@ -66,7 +68,7 @@
<variablelist>
<title>The meaning of the environment variable and configure
options:</title>
-
+<!--
<varlistentry>
<term><parameter>PKG_CONFIG_PATH, LIBS, CFLAGS</parameter></term>
<listitem>
@@ -74,7 +76,7 @@
<xref linkend="ch-tools-util-linux"/> package built earlier.</para>
</listitem>
</varlistentry>
-
+-->
<varlistentry>
<term><parameter>--with-root-prefix=""</parameter> and
<parameter>--bindir=/bin</parameter></term>
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Wed Jul 4 14:16:15 2018 (r11431)
+++ trunk/BOOK/general.ent Fri Jul 6 12:02:39 2018 (r11432)
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20180703">
+<!ENTITY version "SVN-20180706">
<!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 "20180703-systemd">
+<!ENTITY versiond "20180706-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "July 3, 2018">
+<!ENTITY releasedate "July 6, 2018">
<!ENTITY copyrightdate "1999-2018"><!-- jhalfs needs a literal dash, not
– -->
<!ENTITY milestone "8.3">
--
http://lists.linuxfromscratch.org/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
