From 575bcf3c8827cc31ed897e81590ab5c842369b62 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Sun, 12 Feb 2012 18:33:40 +0000
Subject: [PATCH] Modifies package manager scriptlet generation so that it is
 possible to install several packages instead of only one (needed for pacman)

---
 LFS/lfs.xsl                         | 18 +++++++++---------
 pkgmngt/packageManager.xml          |  4 ++--
 pkgmngt/packageManager.xml.template |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 8127e37..950d327 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -84,17 +84,17 @@
     <!-- Inclusion of package manager scriptlets -->
     <xsl:if test="@id='ch-tools-stripping' and $pkgmngt='y'">
       <xsl:apply-templates
-              select="document('packageManager.xml')//sect1[@id='ch-tools-pkgmngt']"
+              select="document('packageManager.xml')//sect1[contains(@id,'ch-tools')]"
               mode="pkgmngt">
-        <xsl:with-param name="order" select="concat($order,'-1')"/>
+        <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'">
       <xsl:apply-templates
-              select="document('packageManager.xml')//sect1[@id='ch-system-pkgmngt']"
+              select="document('packageManager.xml')//sect1[contains(@id,'ch-system')]"
               mode="pkgmngt">
-        <xsl:with-param name="order" select="concat($order,'-1')"/>
+        <xsl:with-param name="order" select="$order"/>
         <xsl:with-param name="dirname" select="$dirname"/>
       </xsl:apply-templates>
     </xsl:if>
@@ -217,13 +217,13 @@ fi
       <xsl:if test="@id='ch-system-creatingdirs'">
         <xsl:apply-templates
            select="document('packageManager.xml')//sect1[
-                                       @id='ch-system-pkgmngt-creatingdirs'
+                                       @id='ch-pkgmngt-creatingdirs'
                                                         ]//userinput"/>
       </xsl:if>
       <xsl:if test="@id='ch-system-createfiles'">
         <xsl:apply-templates
            select="document('packageManager.xml')//sect1[
-                                       @id='ch-system-pkgmngt-createfiles'
+                                       @id='ch-pkgmngt-createfiles'
                                                         ]//userinput"/>
       </xsl:if>
       <xsl:if test="not(@id='ch-system-chroot') and
@@ -238,13 +238,13 @@ fi
 <xsl:template match="sect1" mode="pkgmngt">
     <xsl:param name="dirname" select="chapter05"/>
     <!-- The build order -->
-    <xsl:param name="order" select="062-1"/>
+    <xsl:param name="order" select="062"/>
 <!-- The file names -->
     <xsl:variable name="pi-file" select="processing-instruction('dbhtml')"/>
     <xsl:variable name="pi-file-value" select="substring-after($pi-file,'filename=')"/>
     <xsl:variable name="filename" select="substring-before(substring($pi-file-value,2),'.html')"/>
      <!-- Creating dirs and files -->
-    <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
+    <exsl:document href="{$dirname}/{$order}-{position()}-{$filename}" method="text">
       <xsl:text>#!/bin/bash
 set +h
 set -e
@@ -254,7 +254,7 @@ cd $PKGDIR
       <xsl:apply-templates
            select=".//screen[not(@role) or @role != 'nodump']/userinput[@remap != 'adjust']"
            mode="pkgmngt"/>
-      <xsl:if test="@id = 'ch-system-pkgmngt'">
+      <xsl:if test="$dirname = 'chapter06'">
         <xsl:text>packInstall
 rm -rf $PKG_DEST
 </xsl:text>
diff --git a/pkgmngt/packageManager.xml b/pkgmngt/packageManager.xml
index d971107..cc366c8 100644
--- a/pkgmngt/packageManager.xml
+++ b/pkgmngt/packageManager.xml
@@ -192,7 +192,7 @@ EOF</userinput></screen>
 
 </sect1>
 
-<sect1 id="ch-system-pkgmngt-creatingdirs">
+<sect1 id="ch-pkgmngt-creatingdirs">
   <?dbhtml filename="creatingdirs.html"?>
 
   <title>Adding Directories for package management</title>
@@ -209,7 +209,7 @@ mkdir -pv /var/lib/packages</userinput></screen>
 
 </sect1>
 
-<sect1 id="ch-system-pkgmngt-createfiles">
+<sect1 id="ch-pkgmngt-createfiles">
   <?dbhtml filename="createfiles.html"?>
 
   <title>Adding administrative files for Dpkg</title>
diff --git a/pkgmngt/packageManager.xml.template b/pkgmngt/packageManager.xml.template
index c3618aa..04772fb 100644
--- a/pkgmngt/packageManager.xml.template
+++ b/pkgmngt/packageManager.xml.template
@@ -81,16 +81,16 @@ EOF</userinput></screen>
 <!-- Mandatory section for creating dirs. These instructions are added at the
 end of the creating dirs instructions of the book. Do not change the
 following line -->
-<sect1 id="ch-system-pkgmngt-creatingdirs">
+<sect1 id="ch-pkgmngt-creatingdirs">
 
-<!-- Put the create dir intructions there. fille free to add
+<!-- Put the create dir intructions there. feel free to add
 any explaining <title>Title</title> and <para>explanations</para> -->
 <screen><userinput>mkdir -pv /var/{log,lib/dpkg/{info,updates}}
 mkdir -pv /var/lib/packages</userinput></screen>
 
 </sect1>
 <!-- Same for files. Do not change the following line -->
-<sect1 id="ch-system-pkgmngt-createfiles">
+<sect1 id="ch-pkgmngt-createfiles">
 
 <screen><userinput>touch /var/lib/dpkg/{available,status}
 touch /var/log/dpkg.log</userinput></screen>