aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas R. Reno <renodr@linuxfromscratch.org>2020-08-12 00:55:34 +0000
committerDouglas R. Reno <renodr@linuxfromscratch.org>2020-08-12 00:55:34 +0000
commit2ca70d33d9b80102510eb17ddb22ee54c821fda5 (patch)
tree11a48a2a07eb76c44fa16ad555bc76aca77890b7
parent9b9db38c2f9cc31e7976e7d2742adb0b45ee317c (diff)
Update to check-0.15.2
Update to systemd-246 git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12018 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml14
-rw-r--r--chapter03/patches.xml2
-rw-r--r--chapter08/systemd.xml9
-rw-r--r--general.ent6
-rw-r--r--packages.ent20
-rw-r--r--patches.ent4
6 files changed, 35 insertions, 20 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 613af524e..a31685474 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,6 +44,20 @@
-->
<listitem>
<itemizedlist>
+ <para>2020-08-11</para>
+ <listitem revision="systemd">
+ <para>[renodr] - Update to systemd-246. Fixes
+ <ulink url="&lfs-ticket-root;4687">#4687</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[renodr] - Update to check-0.15.2. Fixes
+ <ulink url="&lfs-ticket-root;4711">#4711</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <itemizedlist>
<para>2020-08-10</para>
<listitem>
<para>[ken] - Ensure all the book's perl modules are installed
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index f2379fe3f..a9b34a989 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -91,6 +91,7 @@
</listitem>
</varlistentry>
+<!--
<varlistentry revision="systemd">
<term>Systemd GCC-10 Patch - <token>&systemd-gcc10-patch-size;</token>:</term>
<listitem>
@@ -98,6 +99,7 @@
<para>MD5 sum: <literal>&systemd-gcc10-patch-md5;</literal></para>
</listitem>
</varlistentry>
+-->
</variablelist>
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index 4ddecf0ce..dff2a5ea8 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -40,9 +40,11 @@
<sect2 role="installation">
<title>Installation of systemd</title>
+<!--
<para>First, apply a patch to fix the build with GCC-10 and fix a segfault:</para>
<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-gcc_10-fixes-2.patch</userinput></screen>
+-->
<para>Create a symlink to work around the xsltproc command not being installed:</para>
@@ -54,7 +56,7 @@
<para>Remove tests that cannot be built in chroot:</para>
-<screen><userinput remap="pre">sed '179,$ d' -i src/resolve/meson.build</userinput></screen>
+<screen><userinput remap="pre">sed '177,$ d' -i src/resolve/meson.build</userinput></screen>
<para>Remove an unneeded group,
<systemitem class="groupname">render</systemitem>, from the default udev
@@ -250,8 +252,9 @@ meson --prefix=/usr \
<seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d,
/etc/sysctl.d, /etc/systemd, /etc/tmpfiles.d, /etc/udev,
/etc/xdg/systemd, /lib/systemd, /lib/udev, /usr/include/systemd,
- /usr/lib/binfmt.d, /usr/lib/kernel, /usr/lib/modules-load.d,
- /usr/lib/sysctl.d, /usr/lib/systemd, /usr/lib/tmpfiles.d,
+ /usr/lib/binfmt.d, /usr/lib/environment.d, /usr/lib/kernel,
+ /usr/lib/modules-load.d, /usr/lib/sysctl.d, /usr/lib/systemd,
+ /usr/lib/tmpfiles.d,
/usr/share/doc/systemd-&systemd-version;, /usr/share/factory,
/usr/share/systemd, /var/lib/systemd, and /var/log/journal</seg>
</seglistitem>
diff --git a/general.ent b/general.ent
index 8ddd1d4c3..f3e00722c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20200810">
+<!ENTITY version "SVN-20200811">
<!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 "20200810-systemd">
+<!ENTITY versiond "20200811-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "August 10th, 2020">
+<!ENTITY releasedate "August 11th, 2020">
<!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
diff --git a/packages.ent b/packages.ent
index b4ccd9e59..7eff92a22 100644
--- a/packages.ent
+++ b/packages.ent
@@ -95,10 +95,10 @@
<!ENTITY bzip2-fin-du "7.7 MB">
<!ENTITY bzip2-fin-sbu "less than 0.1 SBU">
-<!ENTITY check-version "0.15.1">
-<!ENTITY check-size "757 KB">
+<!ENTITY check-version "0.15.2">
+<!ENTITY check-size "760 KB">
<!ENTITY check-url "&github;/libcheck/check/releases/download/&check-version;/check-&check-version;.tar.gz">
-<!ENTITY check-md5 "4b22423bb2dddd0f965465d02b568d7b">
+<!ENTITY check-md5 "50fcafcecde5a380415b12e9c574e0b2">
<!ENTITY check-home "https://libcheck.github.io/check">
<!ENTITY check-fin-du "12 MB">
<!ENTITY check-fin-sbu "0.1 SBU (about 3.3 SBU with tests)">
@@ -621,21 +621,21 @@
<!ENTITY sysklogd-fin-du "0.6 MB">
<!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
-<!ENTITY systemd-version "245">
+<!ENTITY systemd-version "246">
<!--<!ENTITY systemd-stable "6b4878d">-->
<!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel
change that is incompatible, we will switch to the backport branch until the next stable release. -->
-<!ENTITY systemd-size "8,784 KB">
+<!ENTITY systemd-size "9,312 KB">
<!ENTITY systemd-url "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
<!--<!ENTITY systemd-url "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
-<!ENTITY systemd-md5 "04f02d9841ea5992a16f6b03c873da28">
+<!ENTITY systemd-md5 "a3e9efa72d0309dd26513a221cdff31b">
<!ENTITY systemd-home "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-size "512 KB">
+<!ENTITY systemd-man-size "592 KB">
<!--<!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
<!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-version;.tar.xz">
-<!ENTITY systemd-man-md5 "ecf8cc4baa33b91ad4212d28e88f8edd">
-<!ENTITY systemd-fin-du "249 MB">
-<!ENTITY systemd-fin-sbu "1.9 SBU">
+<!ENTITY systemd-man-md5 "819cc8ccffe51cb1863846fcb59a784a">
+<!ENTITY systemd-fin-du "262 MB">
+<!ENTITY systemd-fin-sbu "2.0 SBU">
<!ENTITY sysvinit-version "2.97">
<!ENTITY sysvinit-size "124 KB">
diff --git a/patches.ent b/patches.ent
index 3b1534916..fdae855ee 100644
--- a/patches.ent
+++ b/patches.ent
@@ -62,7 +62,3 @@
<!ENTITY systemd-consolidated-patch-md5 "2bad2992f4373eb925885f2ea2fb8d14">
<!ENTITY systemd-consolidated-patch-size "64 KB">
-->
-
-<!ENTITY systemd-gcc10-patch "systemd-&systemd-version;-gcc_10-fixes-2.patch">
-<!ENTITY systemd-gcc10-patch-md5 "5eaac1d3a66118c40814d3b81ad36b71">
-<!ENTITY systemd-gcc10-patch-size "8 KB">