aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appendices/dependencies.xml5
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter06/chapter06.xml14
-rw-r--r--packages.ent2
4 files changed, 13 insertions, 12 deletions
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 5c2538346..f925d2c59 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -2159,7 +2159,7 @@
<segtitle>&dependencies;</segtitle>
<seglistitem>
- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep,
+ <seg>Bash, Binutils, Coreutils, GCC, Gdbm, Gettext, Glibc, Grep,
Libffi, Make, Ncurses, and Sed</seg>
</seglistitem>
</segmentedlist>
@@ -2332,7 +2332,6 @@
</segmentedlist>
<!-- Begin systemd dependency info -->
-<!--
<bridgehead renderas="sect2" id="systemd-dep">Systemd</bridgehead>
<segmentedlist>
@@ -2368,7 +2367,7 @@
<seg>None</seg>
</seglistitem>
</segmentedlist>
--->
+
<!-- Begin Sysvinit dependency info -->
<bridgehead renderas="sect2" id="sysvinit-dep">Sysvinit</bridgehead>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5947ac1ef..5e2e31b20 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -46,6 +46,10 @@
<para>2017-09-24</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Reorder packages in Chapter 6 so Python can use
+ gdbm.</para>
+ </listitem>
+ <listitem>
<para>[dj] - Use upstream systemd tarball with meson build system and
supply only prebuilt man pages.</para>
</listitem>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 401ce50ee..ae47252e1 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -38,14 +38,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ninja.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="meson.xml"/>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
@@ -56,6 +48,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/>
@@ -66,6 +59,11 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ninja.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="meson.xml"/>
+
<!-- systemd only -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
diff --git a/packages.ent b/packages.ent
index 79e1737ed..a6a052134 100644
--- a/packages.ent
+++ b/packages.ent
@@ -601,7 +601,7 @@
<!ENTITY systemd-man-size "356 KB">
<!ENTITY systemd-man-url "http://anduin.linuxfromscratch.org/LFS/systemd-man-pages-&systemd-version;.tar.xz">
<!ENTITY systemd-man-md5 "c52e13fa137b5f0e3900881d3cdccb9a">
-<!ENTITY systemd-ch6-du "255 MB">
+<!ENTITY systemd-ch6-du "13 MB">
<!ENTITY systemd-ch6-sbu "0.6 SBU">
<!ENTITY sysvinit-version "2.88dsf">