Changeset 1ebfd6e4 for chapter06

Timestamp:

03/31/2021 10:41:38 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

566dbac

Parents:

630308d

git-author:

Thomas Trepl <thomas@…> (04/04/2020 06:10:44 AM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:38 AM)

Message:

MultiLib: Merge changes from trunk

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11805 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• automake.xml (modified) (1 diff)
• chapter06.xml (modified) (2 diffs)

chapter06/automake.xml

@@ -68 +68 @@
 
     <para>One test is known to fail in the LFS environment:
-    subobj.sh.</para>
+    tags-lisp-space.sh.</para>
 
     <para>Install the package:</para>

chapter06/chapter06.xml

@@ -89 +89 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
+
   <!-- systemd only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
 
-  <!-- these programs will use libsystemd if available -->
+  <!-- Both sysv on systemd builds -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
+
+  <!-- sysv only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
+
+  <!-- Both sysv and systemd builds -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
 
@@ -101 +107 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-firmware.xml"/>