Author: renodr
Date: Fri Jul 12 13:38:13 2019
New Revision: 11635
Log:
systemd: Fix a FTBFS related to GCC-9 by adding CFLAGS+=-Wno-format-overflow
Remove the obsolete meson option -Dkill-path
Add -Drpmmacrosdir=no to the meson command and remove the command+text as a
result of that
Remove symlinks to Util-Linux libraries created earler in the installation
process to prevent /tools contamination
Minor instruction/code cleanup
Modified:
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter06/systemd.xml
trunk/BOOK/general.ent
Modified: trunk/BOOK/chapter01/changelog.xml
==============================================================================
--- trunk/BOOK/chapter01/changelog.xml Thu Jul 11 17:22:05 2019 (r11634)
+++ trunk/BOOK/chapter01/changelog.xml Fri Jul 12 13:38:13 2019 (r11635)
@@ -43,6 +43,17 @@
appropriate for the entry or if needed the entire day's listitem.
-->
+ <listitem revision="systemd">
+ <para>2019-07-12</para>
+ <itemizedlist>
+ <listitem>
+ <para>[renodr] - Fix an FTBFS for systemd and do minor text
+ and instructions improvements. Also, fix symlinks that were not
+ removed.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
<listitem>
<para>2019-06-29</para>
<itemizedlist>
Modified: trunk/BOOK/chapter06/systemd.xml
==============================================================================
--- trunk/BOOK/chapter06/systemd.xml Thu Jul 11 17:22:05 2019 (r11634)
+++ trunk/BOOK/chapter06/systemd.xml Fri Jul 12 13:38:13 2019 (r11635)
@@ -39,11 +39,6 @@
<sect2 role="installation">
<title>Installation of systemd</title>
- <!--
- <para>Apply a patch to fix two critical security vulnerabilities:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i
../systemd-240-security_fixes-2.patch</userinput></screen>
- -->
<para>Create a symlink to work around missing xsltproc:</para>
@@ -70,13 +65,16 @@
<screen><userinput remap="pre">sed -i 's/GROUP="render", //'
rules/50-udev-default.rules.in</userinput></screen>
+<!-- EDITORS NOTE: At the next systemd release, see if the CFLAGS can be
removed. -->
+
<para>Prepare systemd for compilation:</para>
- <screen><userinput remap="configure">mkdir -p build
+<screen><userinput remap="configure">mkdir -p build
cd build
PKG_CONFIG_PATH="/usr/lib/pkgconfig:/tools/lib/pkgconfig" \
LANG=en_US.UTF-8 \
+CFLAGS+="-Wno-format-overflow" \
meson --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -85,7 +83,6 @@
-Ddefault-dnssec=no \
-Dfirstboot=false \
-Dinstall-tests=false \
- -Dkill-path=/bin/kill \
-Dkmod-path=/bin/kmod \
-Dldconfig=false \
-Dmount-path=/bin/mount \
@@ -96,6 +93,7 @@
-Dsysusers=false \
-Dumount-path=/bin/umount \
-Db_lto=false \
+ -Drpmmacrosdir=no \
..</userinput></screen>
<variablelist>
@@ -174,6 +172,13 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><parameter>-Drpmmacrosdir=no</parameter></term>
+ <listitem>
+ <para>This switch disables installation of RPM Macros
+ for use with systemd because LFS does not support RPM.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
<para>Compile the package:</para>
@@ -188,10 +193,13 @@
<screen><userinput remap="install">LANG=en_US.UTF-8 ninja
install</userinput></screen>
- <para>Remove an unnecessary directory and file:</para>
+ <para>Remove an unnecessary symbolic link:</para>
+
+<screen><userinput remap="install">rm -f /usr/bin/xsltproc</userinput></screen>
+
+ <para>Remove symbolic links to Util-Linux libraries:</para>
-<screen><userinput remap="install">rm -rfv /usr/lib/rpm
-rm -f /usr/bin/xsltproc</userinput></screen>
+<screen><userinput remap="install">rm -fv
/usr/lib/lib{blkid,uuid,mount}.so*</userinput></screen>
<para>Create the <filename>/etc/machine-id</filename> file needed by
<command>systemd-journald</command>:</para>
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Thu Jul 11 17:22:05 2019 (r11634)
+++ trunk/BOOK/general.ent Fri Jul 12 13:38:13 2019 (r11635)
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20190629">
+<!ENTITY version "SVN-20190712">
<!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 "20190629-systemd">
+<!ENTITY versiond "20190712-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "June 29, 2019">
+<!ENTITY releasedate "July 12th, 2019">
<!ENTITY copyrightdate "1999-2019"><!-- jhalfs needs a literal dash, not
– -->
<!ENTITY milestone "8.5">
--
http://lists.linuxfromscratch.org/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
