diff options
| -rw-r--r-- | chapter01/changelog.xml | 14 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 4 | ||||
| -rw-r--r-- | chapter03/patches.xml | 2 | ||||
| -rw-r--r-- | chapter08/systemd.xml | 20 | ||||
| -rw-r--r-- | chapter10/kernel.xml | 11 | ||||
| -rw-r--r-- | packages.ent | 18 | ||||
| -rw-r--r-- | patches.ent | 2 |
7 files changed, 46 insertions, 25 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index b317f9008..d68573a37 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,20 @@ appropriate for the entry or if needed the entire day's listitem. --> <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> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 6633d5743..facce6a2f 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -234,9 +234,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> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 3087d8ffa..7bab9d054 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -119,6 +119,7 @@ </listitem> </varlistentry> + <!-- <varlistentry revision="systemd"> <term>Systemd Upstream Fixes Patch - <token>&systemd-upstream-fixes-patch-size;</token>:</term> <listitem> @@ -126,6 +127,7 @@ <para>MD5 sum: <literal>&systemd-upstream-fixes-patch-md5;</literal></para> </listitem> </varlistentry> + --> </variablelist> diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index ec0ffc4a4..ce03354a8 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -41,14 +41,10 @@ <title>Installation of systemd</title> <!--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> --> <para>Remove two unneeded groups, @@ -59,15 +55,6 @@ <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> <screen><userinput remap="configure">mkdir -p build @@ -217,6 +204,11 @@ meson --prefix=/usr \ <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. If it causes any trouble, we can add this back and also copy it into BLFS --> <!-- diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml index fa518e721..a169aa63c 100644 --- a/chapter10/kernel.xml +++ b/chapter10/kernel.xml @@ -108,6 +108,9 @@ <screen role="nodump" revision="sysv">General setup --> < > 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] [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]</screen> @@ -127,6 +130,9 @@ Networking support ---> Networking options ---> <*> 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] [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS] @@ -204,6 +210,11 @@ File systems ---> configuration menus and create the kernel configuration from 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> <screen><userinput remap="make">make</userinput></screen> diff --git a/packages.ent b/packages.ent index 712c4c192..5c89547e3 100644 --- a/packages.ent +++ b/packages.ent @@ -491,10 +491,10 @@ <!ENTITY markupsafe-fin-du "516 KB"> <!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"> <!ENTITY meson-fin-sbu "less than 0.1 SBU"> @@ -640,20 +640,20 @@ <!ENTITY sysklogd-fin-du "0.6 MB"> <!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"> diff --git a/patches.ent b/patches.ent index 03adb8998..352ec4fdc 100644 --- a/patches.ent +++ b/patches.ent @@ -78,6 +78,8 @@ <!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 "a4449dedf514486b8995ee501d1bb8cc"> <!ENTITY systemd-upstream-fixes-patch-size "4 KB"> +--> |