diff options
| -rw-r--r-- | chapter01/changelog.xml | 11 | ||||
| -rw-r--r-- | chapter06/systemd.xml | 28 | ||||
| -rw-r--r-- | general.ent | 6 |
3 files changed, 32 insertions, 13 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 402145c5a..6525fb893 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -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> diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index 7c52389c5..f90e95498 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -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 @@ done</userinput></screen> <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 @@ meson --prefix=/usr \ -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 @@ meson --prefix=/usr \ -Dsysusers=false \ -Dumount-path=/bin/umount \ -Db_lto=false \ + -Drpmmacrosdir=no \ ..</userinput></screen> <variablelist> @@ -174,6 +172,13 @@ meson --prefix=/usr \ </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 @@ meson --prefix=/usr \ <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> diff --git a/general.ent b/general.ent index 8fd1345d4..aa868a81c 100644 --- a/general.ent +++ b/general.ent @@ -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"> |