Author: dj
Date: Sat Sep 29 18:14:36 2018
New Revision: 11473
Log:
Restore build of Util-Linux in chapter5 to avoid reciprocal dependency for
Systemd.
Moved installation of Util-Linux and E2fsprogs after Procps to satisfy build
order in the Systemd book. This has no effect on the SysV book.
Modified:
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter05/chapter05.xml
trunk/BOOK/chapter05/util-linux.xml
trunk/BOOK/chapter06/chapter06.xml
trunk/BOOK/chapter06/systemd.xml
trunk/BOOK/general.ent
Modified: trunk/BOOK/chapter01/changelog.xml
==============================================================================
--- trunk/BOOK/chapter01/changelog.xml Thu Sep 20 10:02:36 2018 (r11472)
+++ trunk/BOOK/chapter01/changelog.xml Sat Sep 29 18:14:36 2018 (r11473)
@@ -44,6 +44,21 @@
-->
<listitem>
+ <para>2018-09-30</para>
+ <itemizedlist>
+ <listitem revision="systemd">
+ <para>[dj] - Restore build of Util-Linux in chapter5 to avoid
+ reciprocal dependency for Systemd.</para>
+ </listitem>
+ <listitem>
+ <para>[dj] - Moved installation of Util-Linux and E2fsprogs after
+ Procps to satisfy build order in the Systemd book. This has no effect
+ on the SysV book.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2018-09-20</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/chapter05/chapter05.xml
==============================================================================
--- trunk/BOOK/chapter05/chapter05.xml Thu Sep 20 10:02:36 2018 (r11472)
+++ trunk/BOOK/chapter05/chapter05.xml Sat Sep 29 18:14:36 2018 (r11473)
@@ -43,7 +43,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="tar.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="texinfo.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="util-linux.xml"/>-->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="stripping.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="changingowner.xml"/>
Modified: trunk/BOOK/chapter05/util-linux.xml
==============================================================================
--- trunk/BOOK/chapter05/util-linux.xml Thu Sep 20 10:02:36 2018 (r11472)
+++ trunk/BOOK/chapter05/util-linux.xml Sat Sep 29 18:14:36 2018 (r11473)
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-tools-util-linux" role="wrap">
+<sect1 id="ch-tools-util-linux" role="wrap" revision="systemd">
<?dbhtml filename="util-linux.html"?>
<sect1info condition="script">
Modified: trunk/BOOK/chapter06/chapter06.xml
==============================================================================
--- trunk/BOOK/chapter06/chapter06.xml Thu Sep 20 10:02:36 2018 (r11472)
+++ trunk/BOOK/chapter06/chapter06.xml Sat Sep 29 18:14:36 2018 (r11473)
@@ -78,8 +78,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="libpipeline.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="patch.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="man-db.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="tar.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="texinfo.xml"/>
@@ -88,8 +86,11 @@
<!-- systemd only -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="systemd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dbus.xml"/>
- <!-- props needs libsystemd -->
+
+ <!-- these packages libsystemd on systemd builds -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="procps.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="util-linux.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="e2fsprogs.xml"/>
<!-- sysv only -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="sysklogd.xml"/>
Modified: trunk/BOOK/chapter06/systemd.xml
==============================================================================
--- trunk/BOOK/chapter06/systemd.xml Thu Sep 20 10:02:36 2018 (r11472)
+++ trunk/BOOK/chapter06/systemd.xml Sat Sep 29 18:14:36 2018 (r11473)
@@ -44,6 +44,13 @@
<screen><userinput remap="pre">ln -sf /tools/bin/true
/usr/bin/xsltproc</userinput></screen>
+ <para>Because we have not yet installed the final version of Util-Linux,
+ create links to the libraries in the approprite location:</para>
+
+<screen><userinput remap="pre">for file in
/tools/lib64/lib{blkid,mount,uuid}*; do
+ ln -sf $file /usr/lib/
+done</userinput></screen>
+
<para>Set up the man pages:</para>
<screen><userinput remap="pre">tar -xf
../systemd-man-pages-&systemd-version;.tar.xz</userinput></screen>
@@ -67,6 +74,7 @@
<screen><userinput remap="configure">mkdir -p build
cd build
+PKG_CONFIG_PATH="/usr/lib/pkgconfig:/tools/lib64/pkgconfig" \
LANG=en_US.UTF-8 \
meson --prefix=/usr \
--sysconfdir=/etc \
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Thu Sep 20 10:02:36 2018 (r11472)
+++ trunk/BOOK/general.ent Sat Sep 29 18:14:36 2018 (r11473)
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20180920">
+<!ENTITY version "SVN-20180930">
<!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 "20180920-systemd">
+<!ENTITY versiond "20180930-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "September 20, 2018">
+<!ENTITY releasedate "September 30, 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
