gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl (Moody) 2021-11-03 05:45:09 +01:00
commit 4a74a6fd42
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chapter06/gawk.xml
View File

@ -51,7 +51,7 @@
<screen><userinput remap="configure">./configure --prefix=/usr \ <screen><userinput remap="configure">./configure --prefix=/usr \
--host=$LFS_TGT \ --host=$LFS_TGT \
--build=$(./config.guess)</userinput></screen> --build=$(build-aux/config.guess)</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>

6
chapter07/createfiles.xml
View File

@ -61,7 +61,7 @@ EOF</userinput></screen>
command:</para> command:</para>
<screen revision="sysv"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF" <screen revision="sysv"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
<literal>root:x:0:0:root:/root:/usr/bin/bash <literal>root:x:0:0:root:/root:/bin/bash
bin:x:1:1:bin:/dev/null:/usr/bin/false bin:x:1:1:bin:/dev/null:/usr/bin/false
daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false
messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/usr/bin/false messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/usr/bin/false
@ -70,7 +70,7 @@ nobody:x:99:99:Unprivileged User:/dev/null:/usr/bin/false</literal>
EOF</userinput></screen> EOF</userinput></screen>
<screen revision="systemd"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF" <screen revision="systemd"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
<literal>root:x:0:0:root:/root:/usr/bin/bash <literal>root:x:0:0:root:/root:/bin/bash
bin:x:1:1:bin:/dev/null:/usr/bin/false bin:x:1:1:bin:/dev/null:/usr/bin/false
daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false
messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/usr/bin/false messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/usr/bin/false
@ -175,7 +175,7 @@ EOF</userinput></screen>
user. We add this user here and delete this account at the end of that user. We add this user here and delete this account at the end of that
chapter.</para> chapter.</para>
<screen><userinput>echo "tester:x:101:101::/home/tester:/usr/bin/bash" &gt;&gt; /etc/passwd <screen><userinput>echo "tester:x:101:101::/home/tester:/bin/bash" &gt;&gt; /etc/passwd
echo "tester:x:101:" &gt;&gt; /etc/group echo "tester:x:101:" &gt;&gt; /etc/group
install -o tester -d /home/tester</userinput></screen> install -o tester -d /home/tester</userinput></screen>

2
chapter08/systemd.xml
View File

@ -59,7 +59,7 @@
<screen><userinput remap="pre">sed -i -e 's/GROUP="render"/GROUP="video"/' \ <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> -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
<para>Fix a mesaon problem:</para> <para>Fix a meson problem:</para>
<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>