aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas R. Reno <renodr@linuxfromscratch.org>2019-06-08 20:53:45 +0000
committerDouglas R. Reno <renodr@linuxfromscratch.org>2019-06-08 20:53:45 +0000
commit6c347378fd11b83eace8ff5d6dd4b698c830f209 (patch)
tree9770d7783ee7c572eb51990b3f112055f67685e5
parent648209f8b263bb960baa4f60423ea8fb8b2b4cd4 (diff)
Make the removal of symlinks to util-linux headers in Chapter 6 apply only to systemd, since that's the only book that they are created in.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11615 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter06/util-linux.xml4
-rw-r--r--general.ent6
3 files changed, 15 insertions, 5 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8b6bed0ec..ab195f2a0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,6 +44,16 @@
-->
<listitem>
+ <para>2019-06-08</para>
+ <itemizedlist>
+ <listitem>
+ <para>Make it so that the instructions for removing symlinks before building
+ Util-Linux in Chapter 6 are only visible in systemd.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2019-06-03</para>
<itemizedlist>
<listitem>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 58788f4cf..de24d670f 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -60,9 +60,9 @@
<screen><userinput remap="pre">sed -e 's/2^64/(2^64/' -e 's/E &lt;/E) &lt;=/' -e 's/ne /eq /' \
-i tests/ts/ipcs/limits2</userinput></screen>
-->
- <para>Remove the earlier created symlinks:</para>
+ <para revision="systemd">Remove the earlier created symlinks:</para>
-<screen><userinput remap="pre">rm -vf /usr/include/{blkid,libmount,uuid}</userinput></screen>
+<screen revision="systemd"><userinput remap="pre">rm -vf /usr/include/{blkid,libmount,uuid}</userinput></screen>
<para>Prepare Util-linux for compilation:</para>
diff --git a/general.ent b/general.ent
index e041d0940..926dc346b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20190603">
+<!ENTITY version "SVN-20190608">
<!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 "20190603-systemd">
+<!ENTITY versiond "20190608-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "June 3, 2019">
+<!ENTITY releasedate "June 8, 2019">
<!ENTITY copyrightdate "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "8.5">