Changeset 4a74a6f

Timestamp:

11/03/2021 04:45:09 AM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

f08c6def

Parents:

00696e1d (diff), 3328dfd (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:

• chapter06/gawk.xml (modified) (1 diff)
• chapter07/createfiles.xml (modified) (3 diffs)
• chapter08/systemd.xml (modified) (1 diff)

chapter06/gawk.xml

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

chapter07/createfiles.xml

@@ -62 +62 @@
 
 <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
 daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false
@@ -71 +71 @@
 
 <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
 daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false
@@ -176 +176 @@
   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
 install -o tester -d /home/tester</userinput></screen>

chapter08/systemd.xml

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