Changeset f017b22 for LFS

Timestamp:

07/06/2020 05:51:22 AM (4 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

b6e981a

Parents:

2f8d952

Message:

LFS/lfs.xsl: fix cases when using DESTDIR

We cannot use only the fact that it is not in chapter-temporary-tools
since now we have several chapter for the temporary system.
so use a list of chapters (non negated).

File:

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

LFS/lfs.xsl

@@ -236 +236 @@
          test="ancestor::chapter[@id = 'chapter-building-system' or
                                  @id = 'chapter-config'          or
+                                 @id = 'chapter-bootscripts'      or
                                  @id = 'chapter-bootable'] and
                $pkgmngt = 'y' and
@@ -265 +266 @@
     <xsl:if test="ancestor::chapter[@id = 'chapter-building-system' or
                                     @id = 'chapter-config'          or
+                                    @id = 'chapter-bootscripts'     or
                                     @id = 'chapter-bootable'] and
                   descendant::screen[not(@role) or
@@ -447 +449 @@
         </xsl:call-template>
       </xsl:when>
-<!-- Package management -->
+<!-- Package management for installation chapters -->
 <!-- Add $PKG_DEST to installation commands -->
 <!-- Also add -j1 to make install -->
       <xsl:when test="@remap='install' and
-                      not(ancestor::chapter[
-                              @id='chapter-temporary-tools'
-                                           ])">
+                      ancestor::chapter[@id='chapter-building-system' or
+                                        @id = 'chapter-config'        or
+                                        @id = 'chapter-bootscripts'   or
+                                        @id = 'chapter-bootable']">
         <xsl:choose>
           <xsl:when test="$pkgmngt='n'">
@@ -560 +563 @@
       </xsl:when><!-- addition for tzdata + package management -->
       <!-- End addition for package management -->
-      <!-- add -j1 to make install in chapter 5 -->
-      <xsl:when test="ancestor::chapter[@id='chapter-temporary-tools'] and
+      <!-- add -j1 to make install in non final chapters -->
+      <xsl:when test="ancestor::chapter[@id='chapter-temporary-tools'        or
+                                        @id='chapter-chroot-temporary-tools' or
+                                        @id='chapter-cross-tools'] and
                       @remap='install'">
         <xsl:choose>
@@ -574 +579 @@
         </xsl:choose>
         <xsl:text>&#xA;</xsl:text>
-      </xsl:when><!-- chapter 5 install -->
+      </xsl:when><!-- temp chapters install -->
       <!-- The rest of commands -->
       <xsl:otherwise>
@@ -1242 +1247 @@
       </xsl:call-template>
       <xsl:if test = "( ../@id = 'chapter-building-system' or
-                        ../@id = 'chapter-config'         or
-                        ../@id = 'chapter-bootable'       or
+                        ../@id = 'chapter-config'          or
+                        ../@id = 'chapter-bootscripts'     or
+                        ../@id = 'chapter-bootable'        or
                         starts-with(@id,'ch-system') ) and $pkgmngt = 'y'">
 <!-- the last alternative for old books where some sections in