Changeset 1b02a9a

Timestamp:

09/11/2023 08:04:44 AM (9 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

ablfs-more, trunk

Children:

74601a7

Parents:

4ba94ad

git-author:

Xi Ruoyao <xry111@…> (09/11/2023 06:38:15 AM)

git-committer:

Xi Ruoyao <xry111@…> (09/11/2023 08:04:44 AM)

Message:

Replace $(nproc

echo 1) and $(nproc)

Files:

• LFS/lfs.xsl (modified) (3 diffs)
• common/chroot.xsl (modified) (2 diffs)
• common/libs/func_book_parser (modified) (3 diffs)

LFS/lfs.xsl

@@ -28 +28 @@
   -->
   <xsl:param name="testsuite" select="1"/>
+
+  <!-- Parallelism (LFS >= 12.1) -->
+  <xsl:param name="jobs_1" select="1"/>
+  <xsl:param name="jobs_2" select="1"/>
 
   <!-- Install non wide character ncurses 5? -->
@@ -616 +620 @@
         <xsl:value-of select="$hostname"/>
       </xsl:when>
+      <xsl:when test="contains(string(.),'$(nproc || echo 1)')">
+        <xsl:value-of select="$jobs_1"/>
+      </xsl:when>
+      <xsl:when test="contains(string(.),'$(nproc)')">
+        <xsl:value-of select="$jobs_2"/>
+      </xsl:when>
       <xsl:otherwise>
         <xsl:text>**EDITME</xsl:text>
@@ -1081 +1091 @@
     <xsl:param name="eof-seen" select="false()"/>
     <xsl:choose>
+      <xsl:when test="contains($instructions, '$(nproc)')">
+        <xsl:call-template name="comment-test">
+          <xsl:with-param
+            name="instructions"
+            select="concat(substring-before($instructions, '$(nproc)'), $jobs_2, substring-after($instructions, '$(nproc)'))"/>
+          <xsl:with-param name="eof-seen" select="$eof-seen"/>
+        </xsl:call-template>
+      </xsl:when>
       <xsl:when test="contains($instructions,'&#xA;')">
         <xsl:call-template name="comment-test">

common/chroot.xsl

@@ -6 +6 @@
       extension-element-prefixes="exsl"
       version="1.0">
+
+  <xsl:param name="jobs_2" select="1"/>
 
   <xsl:template match="/">
@@ -56 +58 @@
     <xsl:param name="instructions" select="''"/>
     <xsl:choose>
+      <xsl:when test="contains($instructions, '$(nproc || echo 1)')">
+        <xsl:call-template name="extract-chroot">
+          <xsl:with-param
+            name="instructions"
+            select="concat(substring-before($instructions, '$(nproc || echo 1)'), $jobs_2, substring-after($instructions, '$(nproc || echo 1)'))"/>
+        </xsl:call-template>
+      </xsl:when>
       <xsl:when test="not(starts-with($instructions,'&#xA;chroot')) and
                       contains($instructions, '&#xA;chroot')">

common/libs/func_book_parser

@@ -64 +64 @@
   popd > /dev/null
 
+  JOBS_1=1
+  JOBS_2=1
+  case "$OPTIMIZE" in
+    "1") JOBS_2="$N_PARALLEL";;
+    "2") JOBS_1="$N_PARALLEL"; JOBS_2="$N_PARALLEL";;
+  esac
+
   # First profile the book, for revision and arch. Note that
   # MULTIBLIB is set to "default" if pure 64 bit book. In this case,
@@ -103 +110 @@
            --stringparam log-level      "$LOG_LEVEL"    \
            --stringparam script-root    "$SCRIPT_ROOT"  \
+           --stringparam jobs_1         "$JOBS_1"       \
+           --stringparam jobs_2         "$JOBS_2"       \
            --output "./${COMMANDS}/"                    \
            $XSL                                         \
@@ -142 +151 @@
   echo -n "... "
   xsltproc --nonet --xinclude \
-           -o chroot-scripts/ chroot.xsl \
+           --stringparam jobs_2 "$JOBS_2" \
+           -o chroot-scripts/ chroot.xsl  \
            $BOOK/chapter0?/*chroot*.xml >> $LOGDIR/$LOG 2>&1
   echo "done"