Add a sect2 template to lfs.xsl, so that it is possible to build

several packages on the same page

LFS/lfs.xsl

@@ -118,6 +118,42 @@
       <xsl:if test="sect2[@role='installation']">
         <xsl:text>cd $PKGDIR&#xA;</xsl:text>
       </xsl:if>
+      <xsl:apply-templates select="sect2|
+                                   screen[not(@role) or
+                                          @role!='nodump']/userinput"/>
+      <xsl:if test="@id='ch-system-creatingdirs'">
+        <xsl:apply-templates
+           select="document('packageManager.xml')//sect1[
+                                       @id='ch-pkgmngt-creatingdirs'
+                                                        ]//userinput"/>
+      </xsl:if>
+      <xsl:if test="@id='ch-system-createfiles'">
+        <xsl:apply-templates
+           select="document('packageManager.xml')//sect1[
+                                       @id='ch-pkgmngt-createfiles'
+                                                        ]//userinput"/>
+      </xsl:if>
+      <xsl:if test="not(@id='ch-system-chroot') and
+                    not(@id='ch-system-revisedchroot')">
+        <xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text>
+      </xsl:if>
+      <xsl:text>exit&#xA;</xsl:text>
+    </exsl:document>
+    </xsl:if>
+  </xsl:template>
+
+
+
+
+
+
+
+
+
+
+
+
+  <xsl:template match="sect2">
     <xsl:apply-templates
       select=".//screen[not(@role) or
                         @role != 'nodump']/userinput[
@@ -125,7 +161,7 @@
                              @remap = 'configure' or
                              @remap = 'make' or
                              @remap = 'test' and
-                                not(current()/@id='ch-tools-dejagnu')]"/>
+                             not(current()/../@id='ch-tools-dejagnu')]"/>
     <xsl:if
          test="ancestor::chapter[@id != 'chapter-temporary-tools'] and
                $pkgmngt = 'y' and
@@ -142,7 +178,7 @@ case $(uname -m) in
 esac
 </xsl:text>
     </xsl:if>
-      <xsl:if test="@id = 'ch-system-glibc' and
+    <xsl:if test="../@id = 'ch-system-glibc' and
                           $pkgmngt = 'y'">
       <xsl:text>mkdir -pv $PKG_DEST/usr/include/{rpc,rpcsvc}
 </xsl:text>
@@ -155,7 +191,7 @@ esac
                   descendant::screen[not(@role) or
                                      @role != 'nodump']/userinput[
                                                        @remap='install']">
-        <xsl:if test="@id = 'ch-system-man-pages'">
+      <xsl:if test="../@id = 'ch-system-man-pages'">
 <!-- those files are provided by the shadow package -->
   <xsl:text>rm -fv $PKG_DEST/usr/share/man/{man3/getspnam.3,man5/passwd.5}
 </xsl:text>
@@ -178,11 +214,13 @@ packInstall
 rm -rf $PKG_DEST
 </xsl:text>
     </xsl:if>
-      <xsl:if test="$testsuite='3' and @id='ch-tools-glibc'">
+    <xsl:if test="$testsuite='3' and
+            ../@id='ch-tools-glibc' and
+            @role='installation'">
       <xsl:copy-of select="//userinput[@remap='locale-test']"/>
       <xsl:text>&#xA;</xsl:text>
     </xsl:if>
-      <xsl:if test="@id='ch-system-glibc'">
+    <xsl:if test="../@id='ch-system-glibc' and @role='installation'">
       <xsl:choose>
         <xsl:when test="$full-locale='y'">
           <xsl:copy-of select="//userinput[@remap='locale-full']"/>
@@ -212,27 +250,8 @@ fi
                         ]/userinput[
                           not(@remap) or
                           @remap='adjust' or
-                            @remap='test' and current()/@id='ch-tools-dejagnu'
+                          @remap='test' and current()/../@id='ch-tools-dejagnu'
                                    ]"/>
-      <xsl:if test="@id='ch-system-creatingdirs'">
-        <xsl:apply-templates
-           select="document('packageManager.xml')//sect1[
-                                       @id='ch-pkgmngt-creatingdirs'
-                                                        ]//userinput"/>
-      </xsl:if>
-      <xsl:if test="@id='ch-system-createfiles'">
-        <xsl:apply-templates
-           select="document('packageManager.xml')//sect1[
-                                       @id='ch-pkgmngt-createfiles'
-                                                        ]//userinput"/>
-      </xsl:if>
-      <xsl:if test="not(@id='ch-system-chroot') and
-                    not(@id='ch-system-revisedchroot')">
-        <xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text>
-      </xsl:if>
-      <xsl:text>exit&#xA;</xsl:text>
-    </exsl:document>
-    </xsl:if>
   </xsl:template>
 
   <xsl:template match="sect1" mode="pkgmngt">

common/libs/func_book_parser

@@ -137,7 +137,9 @@ extract_commands() {         #
     lfs)
         echo -n " ${L_arrow}${BOLD}LFS${R_arrow} build... "
         pushd $BOOK > /dev/null
+        if [ -f process.scripts.sh ]; then
           bash process-scripts.sh >> $LOGDIR/$LOG 2>&1
+        fi
         popd > /dev/null
         xsltproc --nonet \
                  --xinclude \

common/libs/func_wrt_Makefile

@@ -96,6 +96,8 @@ get_package_tarball_name() {       #
          ;;
      e2fsprogs-libs) echo $(grep "^e2fsprogs" $JHALFSDIR/pkg_tarball_list | head -n1 )
          ;;
+     libcap) echo $(grep "^libcap" $JHALFSDIR/pkg_tarball_list | head -n1 )
+         ;;
      util-linux-libs) echo $(grep "^util-linux" $JHALFSDIR/pkg_tarball_list | head -n1 )
          ;;
      xz-utils) echo $(grep "^xz" $JHALFSDIR/pkg_tarball_list | head -n1 )