gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-07-09 13:59:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream changes

Browse Source
This commit is contained in:
Thomas Trepl (Moody) 2021-11-17 16:03:17 +01:00
commit d24dc0f95d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chapter01/changelog.xml
View File

@ -50,7 +50,7 @@
<para>[bdubbs] - Update to elfutils-0.186. Fixes <para>[bdubbs] - Update to elfutils-0.186. Fixes
<ulink url="&lfs-ticket-root;4954">#4954</ulink>.</para> <ulink url="&lfs-ticket-root;4954">#4954</ulink>.</para>
</listitem> </listitem>
<listitem revision="systemd">> <listitem revision="systemd">
<para>[bdubbs] - Update to jinja2-3.0.3. Fixes <para>[bdubbs] - Update to jinja2-3.0.3. Fixes
<ulink url="&lfs-ticket-root;4953">#4953</ulink>.</para> <ulink url="&lfs-ticket-root;4953">#4953</ulink>.</para>
</listitem> </listitem>

3
chapter08/systemd.xml
View File

@ -63,7 +63,8 @@
<screen><userinput remap="pre">sed -i 's/+ want_libfuzzer.*$/and want_libfuzzer/' meson.build</userinput></screen> <screen><userinput remap="pre">sed -i 's/+ want_libfuzzer.*$/and want_libfuzzer/' meson.build</userinput></screen>
<para>Fix a problem when using a kernel version 5.14 and later:</para> <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> <screen><userinput remap="pre">sed -i '/ARPHRD_CAN/a#define ARPHRD_MCTP 290' src/basic/linux/if_arp.h</userinput></screen>