Changeset 49f8b03 for LFS/lfs.xsl

Timestamp:

06/24/2020 06:26:05 AM (4 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

d5a739a

Parents:

13e52a5

Message:

Fix package management for new book, and add a patch for porg

File:

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

LFS/lfs.xsl

@@ -144 +144 @@
       <xsl:value-of select="$position"/>
     </xsl:variable>
-    <!-- Inclusion of package manager scriptlets -->
-    <xsl:if test="@id='ch-tools-stripping' and
-                  $pkgmngt='y' and
-                  $bashdir='/tools'">
-      <xsl:apply-templates
-        select="document('packageManager.xml')//sect1[contains(@id,'ch-tools')]"
-        mode="pkgmngt">
-        <xsl:with-param name="order" select="$order"/>
-        <xsl:with-param name="dirname" select="$dirname"/>
-      </xsl:apply-templates>
-    </xsl:if>
-    <xsl:if test="@id='ch-system-strippingagain' and
-                  $pkgmngt='y' and
-                  $bashdir='/tools'">
-      <xsl:apply-templates
-              select="document('packageManager.xml')//sect1[
-                                              contains(@id,'ch-system')]"
-              mode="pkgmngt">
-        <xsl:with-param name="order" select="$order"/>
-        <xsl:with-param name="dirname" select="$dirname"/>
-      </xsl:apply-templates>
-    </xsl:if>
     <!-- Creating dirs and files -->
     <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
@@ -188 +166 @@
            select="sect2 |
                    screen[not(@role) or @role!='nodump']/userinput"/>
-      <xsl:if test="@id='ch-system-creatingdirs' and $pkgmngt='y'">
+      <xsl:if test="contains(@id,'creatingdirs') and $pkgmngt='y'">
         <xsl:apply-templates
            select="document('packageManager.xml')//sect1[
@@ -195 +173 @@
            mode="pkgmngt"/>
       </xsl:if>
-      <xsl:if test="@id='ch-system-createfiles' and $pkgmngt='y'">
+      <xsl:if test="contains(@id,'createfiles')
+                and $pkgmngt='y'
+                and $bashdir='/tools'">
         <xsl:apply-templates
            select="document('packageManager.xml')//sect1[
@@ -208 +188 @@
       <xsl:text>exit&#xA;</xsl:text>
     </exsl:document>
+    <!-- Inclusion of package manager scriptlets -->
+    <xsl:if test="$pkgmngt='y' and
+                  following-sibling::sect1[1][@id='ch-tools-stripping']">
+      <xsl:choose>
+        <xsl:when test="$bashdir='/tools'">
+          <xsl:apply-templates
+            select="document('packageManager.xml')//sect1[
+                                              contains(@id,'ch-tools')]"
+            mode="pkgmngt">
+            <xsl:with-param name="order" select="$order+1"/>
+            <xsl:with-param name="dirname" select="$dirname"/>
+          </xsl:apply-templates>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates
+            select="document('packageManager.xml')//sect1[
+                                              contains(@id,'ch-chroot')]"
+            mode="pkgmngt">
+            <xsl:with-param name="order" select="$order+1"/>
+            <xsl:with-param name="dirname" select="$dirname"/>
+          </xsl:apply-templates>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:if>
+    <xsl:if test="$pkgmngt='y' and
+                  following-sibling::sect1[2][@id='ch-system-strippingagain']">
+      <xsl:apply-templates
+              select="document('packageManager.xml')//sect1[
+                                              contains(@id,'ch-system')]"
+              mode="pkgmngt">
+        <xsl:with-param name="order" select="$order+1"/>
+        <xsl:with-param name="dirname" select="$dirname"/>
+      </xsl:apply-templates>
+    </xsl:if>
   </xsl:template>
 
@@ -220 +234 @@
                              not(current()/../@id='ch-system-systemd')]"/>
     <xsl:if
-         test="ancestor::chapter[@id != 'chapter-temporary-tools'] and
+         test="ancestor::chapter[@id = 'chapter-building-system' or
+                                 @id = 'chapter-config'          or
+                                 @id = 'chapter-bootable'] and
                $pkgmngt = 'y' and
                descendant::screen[not(@role) or
@@ -247 +263 @@
          select=".//screen[not(@role) or @role != 'nodump']/
                        userinput[@remap = 'install']"/>
-    <xsl:if test="ancestor::chapter[@id != 'chapter-temporary-tools'] and
+    <xsl:if test="ancestor::chapter[@id = 'chapter-building-system' or
+                                    @id = 'chapter-config'          or
+                                    @id = 'chapter-bootable'] and
                   descendant::screen[not(@role) or
                                      @role != 'nodump']/userinput[
@@ -368 +386 @@
                             @role != 'nodump']/userinput[@remap != 'adjust']"
            mode="pkgmngt"/>
-        <xsl:if test="$dirname = 'chapter06'">
+        <xsl:if test="$dirname = 'chapter06' or $dirname = 'chapter08'">
           <xsl:text>PREV_SEC=${SECONDS}
 packInstall
@@ -1217 +1235 @@
         <xsl:with-param name="path" select=".//sect1info/address/text()"/>
       </xsl:call-template>
-      <xsl:if test = "( ../@id != 'chapter-temporary-tools' or
-                      starts-with(@id,'ch-system') ) and $pkgmngt = 'y'">
+      <xsl:if test = "( ../@id = 'chapter-building-system' or
+                        ../@id = 'chapter-config'         or
+                        ../@id = 'chapter-bootable'       or
+                        starts-with(@id,'ch-system') ) and $pkgmngt = 'y'">
+<!-- the last alternative for old books where some sections in
+     chapter-config had ch-system -->
         <xsl:text>
 source ${ROOT}${SCRIPT_ROOT}/packInstall.sh