Changeset 26ae89a for chapter06/systemd.xml

Timestamp:

01/02/2016 12:00:54 PM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

7.9-systemd

Children:

ee46f60

Parents:

6e13139

Message:

Fix systemd chapter 6 build, move util-linux back to end of chapter 6, remove sysmlink for /etc/resolv.conf

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/systemd@10985 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter06/systemd.xml (modified) (2 diffs)

chapter06/systemd.xml

@@ -41 +41 @@
     <title>Installation of systemd</title>
 
-    <para>First, create a file to allow systemd to build when using Util-Linux
+    <para>First, fix a build error when using Util-Linux built in
+    Chapter 5:</para>
+
+<screen><userinput remap="pre">sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")</userinput></screen>
+
+    <para>Apply the following patch so that compat
+    <command>pkg-config</command> files get installed without installing compat
+    libs which are useless on LFS:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
+
+    <para>Disable two tests that always fail:</para>
+
+<screen><userinput remap="pre">sed -e 's:test/udev-test.pl ::g'  \
+    -e 's:test-copy$(EXEEXT) ::g' \
+    -i Makefile.in</userinput></screen>
+
+    <para>Rebuild generated files after modifying Makefile.am and 
+    Makefile.in:</para>
+
+<screen><userinput remap="pre">autoreconf -fi</userinput></screen>
+
+    <para>Create a file to allow systemd to build when using Util-Linux
     built in Chapter 5, to disable LTO by default, and to build without
     xlstproc:</para>
@@ -59 +81 @@
 EOF</userinput></screen>
 
-    <para>LTO is disabled by default because it causes <command>systemd</command>
-    and other auxiliary programs to link to <filename
-    class="libraryfile">libgcc_s.so</filename>, slows the build down and makes the
-    compiled code larger.</para>
-
-    <para>Additionally, fix a build error when using Util-Linux built in
-    Chapter 5:</para>
-
-<screen><userinput remap="pre">sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")</userinput></screen>
-
-    <para>Apply the following patch so that compat <command>pkg-config</command> files
-    get installed without installing compat libs which are useless on LFS:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
-
-    <para>Disable two tests that always fail:</para>
-
-<screen><userinput remap="pre">sed -e 's:test/udev-test.pl ::g'  \
-    -e 's:test-copy$(EXEEXT) ::g' \
-    -i Makefile.in</userinput></screen>
+    <para>LTO is disabled by default because it causes
+    <command>systemd</command> and other auxiliary programs to link to
+    <filename class="libraryfile">libgcc_s.so</filename>, slows the build down
+    and makes the compiled code larger.</para>
 
     <para>Prepare systemd for compilation:</para>