diff options
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 10 | ||||
| -rw-r--r-- | chapter03/patches.xml | 16 | ||||
| -rw-r--r-- | chapter08/systemd.xml | 14 | ||||
| -rw-r--r-- | packages.ent | 10 | ||||
| -rw-r--r-- | patches.ent | 8 |
6 files changed, 26 insertions, 42 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index c526bd946..9fc3edcc7 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -41,6 +41,16 @@ --> <listitem> + <para>2022-05-29</para> + <itemizedlist> + <listitem> + <para>[xry111] - Update to systemd-251. Fixes + <ulink url="&lfs-ticket-root;5064">#5064</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2022-05-16</para> <itemizedlist> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 045de4c9d..88db30bb9 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -230,9 +230,9 @@ <!--<listitem revision="sysv"> <para>Sysklogd-&sysklogd-version;</para> </listitem>--> - <!--<listitem revision="systemd"> + <listitem revision="systemd"> <para>Systemd-&systemd-version;</para> - </listitem>--> + </listitem> <listitem revision="sysv"> <para>SysVinit-&sysvinit-version;</para> </listitem> @@ -298,6 +298,12 @@ <listitem> <para>perl-5.34.0-upstream_fixes-1.patch</para> </listitem> + <listitem> + <para>systemd-250-kernel_5.17_fixes-1.patch</para> + </listitem> + <listitem> + <para>systemd-250-upstream_fixes-1.patch</para> + </listitem> </itemizedlist> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index bed7d4735..1df01b443 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -135,22 +135,6 @@ </listitem> </varlistentry> - <varlistentry revision="systemd"> - <term>Systemd Upstream Fixes Patch - <token>&systemd-upstream-fixes-patch-size;</token>:</term> - <listitem> - <para>Download: <ulink url="&patches-root;&systemd-upstream-fixes-patch;"/></para> - <para>MD5 sum: <literal>&systemd-upstream-fixes-patch-md5;</literal></para> - </listitem> - </varlistentry> - - <varlistentry revision="systemd"> - <term>Systemd Kernel Fixes Patch - <token>&systemd-kernel-fixes-patch-size;</token>:</term> - <listitem> - <para>Download: <ulink url="&patches-root;&systemd-kernel-fixes-patch;"/></para> - <para>MD5 sum: <literal>&systemd-kernel-fixes-patch-md5;</literal></para> - </listitem> - </varlistentry> - <varlistentry> <term>Xz Upstream Fix Patch - <token>&xz-upstream-fix-patch-size;</token>:</term> <listitem> diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index 43e1cea6c..f207e74c2 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -40,16 +40,6 @@ <sect2 role="installation"> <title>Installation of systemd</title> - <para>First, apply a patch to fix a security vulnerability and regressions - with hostnames and idle units:</para> - -<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen> - - <para>Now, apply a patch to fix a problem with the linux kernel's headers in - version 5.17 and later:</para> - -<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-kernel_5.17_fixes-1.patch</userinput></screen> - <para>Remove two unneeded groups, <systemitem class="groupname">render</systemitem> and <systemitem class="groupname">sgx</systemitem>, from the default udev @@ -185,7 +175,9 @@ meson --prefix=/usr \ <para>Install the man pages:</para> -<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz -C /usr/share/man</userinput></screen> + <!-- Please make sure systemd man pages tarball has a common leading + component in the path. --> +<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man</userinput></screen> <para>Remove a useless directory:</para> diff --git a/packages.ent b/packages.ent index 52ebc6b64..3dd50b28b 100644 --- a/packages.ent +++ b/packages.ent @@ -640,20 +640,20 @@ <!ENTITY sysklogd-fin-du "0.6 MB"> <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU"> -<!ENTITY systemd-version "250"> +<!ENTITY systemd-version "251"> <!--<!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 "10,856 KB"> +<!ENTITY systemd-size "11,168 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 "8929beb037c587ada4ed201f19756fe2"> +<!ENTITY systemd-md5 "8090fcccc3a2ec20995e89d56fed61b1"> <!ENTITY systemd-home "https://www.freedesktop.org/wiki/Software/systemd/"> -<!ENTITY systemd-man-version "250"> +<!ENTITY systemd-man-version "251"> <!ENTITY systemd-man-size "596 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-man-version;.tar.xz"> -<!ENTITY systemd-man-md5 "af3aca39abe4e990cb2a9ac63dcdf506"> +<!ENTITY systemd-man-md5 "87053ffef1cfb74e4fe28f627e12a2a4"> <!ENTITY systemd-fin-du "273 MB"> <!ENTITY systemd-fin-sbu "2.2 SBU"> diff --git a/patches.ent b/patches.ent index 2bd68296b..6c5acb77c 100644 --- a/patches.ent +++ b/patches.ent @@ -85,14 +85,6 @@ <!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc"> <!ENTITY sysvinit-consolidated-patch-size "2.4 KB"> -<!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-1.patch"> -<!ENTITY systemd-upstream-fixes-patch-md5 "71eac6abdad5fba2039dcd011a9ae5b3"> -<!ENTITY systemd-upstream-fixes-patch-size "20 KB"> - -<!ENTITY systemd-kernel-fixes-patch "systemd-&systemd-version;-kernel_5.17_fixes-1.patch"> -<!ENTITY systemd-kernel-fixes-patch-md5 "34cee987b35d5d522fd3317e08057c1d"> -<!ENTITY systemd-kernel-fixes-patch-size "2.7 KB"> - <!ENTITY xz-upstream-fix-patch "xz-&xz-version;-upstream_fix-1.patch"> <!ENTITY xz-upstream-fix-patch-md5 "584c72ea3d8f7502b2770670f3090788"> <!ENTITY xz-upstream-fix-patch-size "3.7 KB"> |