diff options
| author | DJ Lucas <dj@linuxfromscratch.org> | 2018-09-30 01:14:36 +0000 |
|---|---|---|
| committer | DJ Lucas <dj@linuxfromscratch.org> | 2018-09-30 01:14:36 +0000 |
| commit | cc09c074d6c216d901a7b497089cf0fbc97f0548 (patch) | |
| tree | 2c102c42aba258c989cbf0e5af4dd2c907c38678 /chapter06 | |
| parent | 6c672426f85596f90903645f78d510d52f2846a5 (diff) | |
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.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11473 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
| -rw-r--r-- | chapter06/chapter06.xml | 7 | ||||
| -rw-r--r-- | chapter06/systemd.xml | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 79212653c..d6025c52a 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -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"/> diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index e5d89b833..0db60770f 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -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 \ |