Changeset af4bd57

Timestamp:

12/31/2021 04:45:09 AM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

0fd2370f

Parents:

0eb19f0 (diff), 6d19228 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (1 diff)
• chapter03/patches.xml (modified) (2 diffs)
• chapter08/systemd.xml (modified) (3 diffs)
• chapter10/kernel.xml (modified) (3 diffs)
• packages.ent (modified) (2 diffs)
• patches.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -41 +41 @@
     -->
     <listitem>
+      <para>2021-12-30</para>
+      <itemizedlist>
+        <listitem revision="systemd">
+          <para>[renodr] - Update to systemd-250. Fixes
+          <ulink url="&lfs-ticket-root;4971">#4971</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to meson-0.60.3. Fixes
+          <ulink url="&lfs-ticket-root;4973">#4973</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-12-15</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -235 +235 @@
       <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>

chapter03/patches.xml

@@ -120 +120 @@
     </varlistentry>
 
+    <!--
     <varlistentry revision="systemd">
       <term>Systemd Upstream Fixes Patch - <token>&systemd-upstream-fixes-patch-size;</token>:</term>
@@ -127 +128 @@
       </listitem>
     </varlistentry>
+    -->
 
   </variablelist>

chapter08/systemd.xml

@@ -42 +42 @@
 
     <!--Fix CVE-2021-33910 -->
+    <!--
     <para>First, apply a patch to fix a security vulnerability:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
-
-<!-- Seems to be not needed anymore with 248
-    <para>Remove tests that cannot be built in chroot:</para>
-
-<screen><userinput remap="pre">sed '177,$ d' -i src/resolve/meson.build</userinput></screen>
 -->
 
@@ -59 +55 @@
  <screen><userinput remap="pre">sed -i -e 's/GROUP="render"/GROUP="video"/' \
         -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
-
-    <para>Fix a meson problem:</para>
-
- <screen><userinput remap="pre">sed -i 's/+ want_libfuzzer.*$/and want_libfuzzer/' meson.build</userinput></screen>
-
- <para>Fix a problem when building with kernel headers from Linux-5.14 and
- later:</para>
-
- <screen><userinput remap="pre">sed -i '/ARPHRD_CAN/a#define ARPHRD_MCTP        290' src/basic/linux/if_arp.h</userinput></screen>
 
     <para>Prepare systemd for compilation:</para>
@@ -217 +204 @@
 
 <screen><userinput remap="adjust">systemctl disable systemd-time-wait-sync.service</userinput></screen>
+
+    <para>Fix a regression in a systemd unit that causes a delay when
+    switching TTYs:</para>
+
+<screen><userinput remap="adjust">sed -i 's/idle/simple/' /usr/lib/systemd/system/getty@.service</userinput></screen>
 
 <!-- dev: 50-pid-max.conf is not removed in BLFS, so I commented the following out.

chapter10/kernel.xml

@@ -109 +109 @@
    < > Enable kernel headers through /sys/kernel/kheaders.tar.xz [CONFIG_IKHEADERS]
 Device Drivers  --->
+  Graphics support --->
+   Frame buffer Devices --->
+      [*] Support for frame buffer devices ----
   Generic Driver Options  --->
    [ ] Support for uevent helper [CONFIG_UEVENT_HELPER]
@@ -128 +131 @@
    <*> The IPv6 protocol [CONFIG_IPV6]
 Device Drivers  --->
+  Graphics support --->
+   Frame buffer Devices --->
+      [*] Support for frame buffer devices ----
   Generic Driver Options  --->
    [ ] Support for uevent helper [CONFIG_UEVENT_HELPER]
@@ -237 +243 @@
     scratch.</para>
 
+    <note revision="systemd">
+      <para revision="systemd">Ensure that CONFIG_DEFAULT_HOSTNAME is set to 'none' or a hostname.
+      If it is left blank, your system will not start.</para>
+    </note>
+
     <para>Compile the kernel image and modules:</para>
 

packages.ent

@@ -500 +500 @@
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.60.2">
-<!ENTITY meson-size "1,952 KB">
+<!ENTITY meson-version "0.60.3">
+<!ENTITY meson-size "1,956 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "48a898e25f35e57a1b72c2b578884960">
+<!ENTITY meson-md5 "03ddd7272d8cbb9f33269cb37a200d24">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "40 MB">
@@ -649 +649 @@
 <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version  "249">
+<!ENTITY systemd-version  "250">
 <!--<!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,344 KB">
+<!ENTITY systemd-size     "10,856 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      "8e8adf909c255914dfc10709bd372e69">
+<!ENTITY systemd-md5      "8929beb037c587ada4ed201f19756fe2">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-version "249">
-<!ENTITY systemd-man-size "584 KB">
+<!ENTITY systemd-man-version "250">
+<!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  "d9f2508d6b114b1c02476cd79b8fc786">
+<!ENTITY systemd-man-md5  "af3aca39abe4e990cb2a9ac63dcdf506">
 <!ENTITY systemd-fin-du   "277 MB">
 <!ENTITY systemd-fin-sbu  "2.3 SBU">

patches.ent

@@ -79 +79 @@
 <!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 "a4449dedf514486b8995ee501d1bb8cc">
 <!ENTITY systemd-upstream-fixes-patch-size "4 KB">
+-->