aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2014-01-26 03:28:05 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2014-01-26 03:28:05 +0000
commit71e0f493b73026bd7a3dc1812bf3bd2ab2a6526f (patch)
tree69ad006da0120b85e4cc9e18a4e0b7c5c573e992
parentef8510e8256871d39acc10f1cc363dbdcd89390d (diff)
Disable unneeded installation of a systemd specific file
in Chapter 5 util-linux. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10450 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml11
-rw-r--r--chapter05/util-linux.xml13
-rw-r--r--general.ent4
3 files changed, 25 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 027148798..83e37a763 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
</listitem>
-->
<listitem>
+ <para>2014-01-25</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Add a configure switch to util-linux
+ in Chapter 5 to prevent an installation error for
+ hosts that have systemd installed.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2014-01-22</para>
<itemizedlist>
<listitem>
diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml
index c049150b4..8407f802c 100644
--- a/chapter05/util-linux.xml
+++ b/chapter05/util-linux.xml
@@ -42,7 +42,9 @@
<para>Prepare Util-linux for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/tools --disable-makeinstall-chown</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools \
+ --disable-makeinstall-chown \
+ --without-systemdsystemunitdir</userinput></screen>
<variablelist>
<title>The meaning of the configure option:</title>
@@ -56,6 +58,15 @@
root.</para>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><parameter>--without-systemdsystemunitdir</parameter></term>
+ <listitem>
+ <para>On systems that use systemd, the package tries to install
+ a systemd specific file to a non-existent directory in /tools.
+ This switch disables the unnecessary action.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
<para>Compile the package:</para>
diff --git a/general.ent b/general.ent
index 6fb9384db..f32cbc748 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20140122">
-<!ENTITY releasedate "January 22, 2014">
+<!ENTITY version "SVN-20140125">
+<!ENTITY releasedate "January 25, 2014">
<!ENTITY copyrightdate "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.5">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->