Changeset 1203312 for chapter05

Timestamp:

09/01/2022 11:27:01 AM (22 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/clfs-ng

Children:

6c952e3

Parents:

9023df4 (diff), baecd49 (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:

Merge remote-tracking branch 'origin/trunk' into xry111/clfs-ng

Location:

chapter05

Files:

• glibc.xml (modified) (2 diffs)
• linux-headers.xml (modified) (1 diff)

chapter05/glibc.xml

@@ -200 +200 @@
       expected. To perform a sanity check, run the following commands:</para>
 
-<screen><userinput>echo 'int main(){}' &gt; dummy.c
-$LFS_TGT-gcc dummy.c
-readelf -l a.out | grep '/ld-linux'</userinput></screen>
+<screen><userinput>echo 'int main(){}' | gcc -xc -
+readelf -l a.out | grep ld-linux</userinput></screen>
 
       <para>If everything is working correctly, there should be no errors,
@@ -217 +216 @@
       continuing on.</para>
 
-      <para>Once all is well, clean up the test files:</para>
-
-<screen><userinput>rm -v dummy.c a.out</userinput></screen>
+      <para>Once all is well, clean up the test file:</para>
+
+<screen><userinput>rm -v a.out</userinput></screen>
 
     </caution>

chapter05/linux-headers.xml

@@ -61 +61 @@
 
 <screen><userinput remap="make">make headers ARCH=<replaceable>x86</replaceable>
-find usr/include -name '.*' -delete
-rm usr/include/Makefile
+find usr/include -type f ! -name '*.h' -delete
 </userinput><userinput remap="install">cp -rv usr/include $LFS/usr</userinput></screen>