aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter06/systemd.xml57
-rw-r--r--general.ent4
3 files changed, 46 insertions, 25 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7cb1f46bc..b6dd76745 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,16 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem.
-->
+ <listitem revision="systemd">
+ <para>2020-05-09</para>
+ <itemizedlist>
+ <listitem>
+ <para>[pierre] - Pass -Wno-format-overflow to systemd to
+ prevent an error with GCC 10.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
<listitem>
<para>2020-05-09</para>
<itemizedlist>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 2870c3846..cbba14a69 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -69,35 +69,46 @@
<screen><userinput remap="configure">mkdir -p build
cd build
-LANG=en_US.UTF-8 \
-meson --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- -Dblkid=true \
- -Dbuildtype=release \
- -Ddefault-dnssec=no \
- -Dfirstboot=false \
- -Dinstall-tests=false \
- -Dkmod-path=/bin/kmod \
- -Dldconfig=false \
- -Dmount-path=/bin/mount \
- -Drootprefix= \
- -Drootlibdir=/lib \
- -Dsplit-usr=true \
- -Dsulogin-path=/sbin/sulogin \
- -Dsysusers=false \
- -Dumount-path=/bin/umount \
- -Db_lto=false \
- -Drpmmacrosdir=no \
- -Dhomed=false \
- -Duserdb=false \
- -Dman=true \
+LANG=en_US.UTF-8 \
+meson --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ -Dc_args=-Wno-format-overflow \
+ -Dblkid=true \
+ -Dbuildtype=release \
+ -Ddefault-dnssec=no \
+ -Dfirstboot=false \
+ -Dinstall-tests=false \
+ -Dkmod-path=/bin/kmod \
+ -Dldconfig=false \
+ -Dmount-path=/bin/mount \
+ -Drootprefix= \
+ -Drootlibdir=/lib \
+ -Dsplit-usr=true \
+ -Dsulogin-path=/sbin/sulogin \
+ -Dsysusers=false \
+ -Dumount-path=/bin/umount \
+ -Db_lto=false \
+ -Drpmmacrosdir=no \
+ -Dhomed=false \
+ -Duserdb=false \
+ -Dman=true \
..</userinput></screen>
<variablelist>
<title>The meaning of the meson options:</title>
<varlistentry>
+ <term><parameter>-Dc_args=-Wno-format-overflow</parameter></term>
+ <listitem>
+ <para>The defaults flags passed to gcc contain
+ <parameter>-Werror=format-overflow</parameter>, which generates
+ an error with GCC 10. Passing this parameter prevents the error
+ from occuring.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><parameter>-D*-path=*</parameter></term>
<listitem>
<para>These switches provide location of binaries needed by
diff --git a/general.ent b/general.ent
index dd42dc5e9..0193899ed 100644
--- a/general.ent
+++ b/general.ent
@@ -3,11 +3,11 @@
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "cross-chap5"> <!-- Use "development" or "x.y[-pre{x}]" -->
-<!ENTITY versiond "20200508-cross-cp5-systemd">
+<!ENTITY versiond "20200509-cross-cp5-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "May 8th, 2020">
+<!ENTITY releasedate "May 9th, 2020">
<!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->