Changeset 13e52a5 for LFS

Timestamp:

06/20/2020 05:16:22 PM (4 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

49f8b03

Parents:

706e5bf

Message:

Add the multilib book: fixes ticket #1722

File:

• LFS/lfs.xsl (modified) (6 diffs)

LFS/lfs.xsl

@@ -10 +10 @@
 
 <!-- Parameters -->
-
-  <!-- which revision attribute to include: can only be sysv or systemd,
-       but we leave checking to the caller-->
-  <xsl:param name="revision" select="'sysv'"/>
 
   <!-- use package management ?
@@ -119 +115 @@
   <xsl:template match="chapter">
     <xsl:apply-templates select="./sect1[
-             (not(@revision) or @revision=$revision) and
-             .//screen[(not(@role) or @role != 'nodump') and
-                       (not(@revision) or @revision=$revision)]/
+             .//screen[not(@role) or @role != 'nodump']/
                           userinput[not(starts-with(string(),'chroot'))]]">
       <xsl:with-param name="chap-num" select="position()+3"/>
@@ -191 +185 @@
         </xsl:call-template>
       </xsl:if>
-      <xsl:apply-templates select="sect2[not(@revision) or
-                                         @revision=$revision] |
-                                   screen[(not(@role) or
-                                           @role!='nodump') and
-                                          (not(@revision) or
-                                           @revision=$revision)]/userinput"/>
+      <xsl:apply-templates
+           select="sect2 |
+                   screen[not(@role) or @role!='nodump']/userinput"/>
       <xsl:if test="@id='ch-system-creatingdirs' and $pkgmngt='y'">
         <xsl:apply-templates
@@ -221 +212 @@
   <xsl:template match="sect2">
     <xsl:apply-templates
-      select=".//screen[(not(@role) or
-                         @role != 'nodump') and
-                        (not(@revision) or
-                         @revision=$revision)]/userinput[
+      select=".//screen[not(@role) or @role != 'nodump']/userinput[
                              @remap = 'pre' or
                              @remap = 'configure' or
@@ -257 +245 @@
     </xsl:if>
     <xsl:apply-templates
-         select=".//screen[(not(@role) or
-                            @role != 'nodump') and
-                           (not(@revision) or
-                            @revision=$revision)]/userinput[@remap = 'install']"/>
+         select=".//screen[not(@role) or @role != 'nodump']/
+                       userinput[@remap = 'install']"/>
     <xsl:if test="ancestor::chapter[@id != 'chapter-temporary-tools'] and
                   descendant::screen[not(@role) or
@@ -346 +332 @@
     </xsl:if>
     <xsl:apply-templates
-       select=".//screen[
-                (not(@role) or
-                 @role != 'nodump') and
-                (not(@revision) or
-                 @revision=$revision)
-                        ]/userinput[
+       select=".//screen[not(@role) or @role != 'nodump']/userinput[
                        not(@remap) or
                        @remap='adjust' or
                        @remap='test' and current()/../@id='ch-tools-dejagnu' or
                        @remap='test' and current()/../@id='ch-system-systemd'
-                                   ]"/>
+                                                                   ]"/>
     <xsl:if test="../@id='ch-system-ncurses' and $ncurses5='y'">
       <xsl:apply-templates select=".//screen[@role='nodump']"/>