zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Modifies package manager scriptlet generation so that it is possible to

Browse source 
install several packages instead of only one (needed for pacman)
This commit is contained in:
Pierre Labastie 2012-02-12 18:33:40 +00:00
parent 4fa38dd3c1
commit 575bcf3c88
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
LFS/lfs.xsl
View file

@ -84,17 +84,17 @@
<!-- Inclusion of package manager scriptlets --> <!-- Inclusion of package manager scriptlets -->
<xsl:if test="@id='ch-tools-stripping' and $pkgmngt='y'"> <xsl:if test="@id='ch-tools-stripping' and $pkgmngt='y'">
<xsl:apply-templates <xsl:apply-templates
select="document('packageManager.xml')//sect1[@id='ch-tools-pkgmngt']" select="document('packageManager.xml')//sect1[contains(@id,'ch-tools')]"
mode="pkgmngt"> 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:with-param name="dirname" select="$dirname"/>
</xsl:apply-templates> </xsl:apply-templates>
</xsl:if> </xsl:if>
<xsl:if test="@id='ch-system-strippingagain' and $pkgmngt='y'"> <xsl:if test="@id='ch-system-strippingagain' and $pkgmngt='y'">
<xsl:apply-templates <xsl:apply-templates
select="document('packageManager.xml')//sect1[@id='ch-system-pkgmngt']" select="document('packageManager.xml')//sect1[contains(@id,'ch-system')]"
mode="pkgmngt"> 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:with-param name="dirname" select="$dirname"/>
</xsl:apply-templates> </xsl:apply-templates>
</xsl:if> </xsl:if>
@ -217,13 +217,13 @@ fi
<xsl:if test="@id='ch-system-creatingdirs'"> <xsl:if test="@id='ch-system-creatingdirs'">
<xsl:apply-templates <xsl:apply-templates
select="document('packageManager.xml')//sect1[ select="document('packageManager.xml')//sect1[
@id='ch-system-pkgmngt-creatingdirs' @id='ch-pkgmngt-creatingdirs'
]//userinput"/> ]//userinput"/>
</xsl:if> </xsl:if>
<xsl:if test="@id='ch-system-createfiles'"> <xsl:if test="@id='ch-system-createfiles'">
<xsl:apply-templates <xsl:apply-templates
select="document('packageManager.xml')//sect1[ select="document('packageManager.xml')//sect1[
@id='ch-system-pkgmngt-createfiles' @id='ch-pkgmngt-createfiles'
]//userinput"/> ]//userinput"/>
</xsl:if> </xsl:if>
<xsl:if test="not(@id='ch-system-chroot') and <xsl:if test="not(@id='ch-system-chroot') and
@ -238,13 +238,13 @@ fi
<xsl:template match="sect1" mode="pkgmngt"> <xsl:template match="sect1" mode="pkgmngt">
<xsl:param name="dirname" select="chapter05"/> <xsl:param name="dirname" select="chapter05"/>
<!-- The build order --> <!-- The build order -->
<xsl:param name="order" select="062-1"/> <xsl:param name="order" select="062"/>
<!-- The file names --> <!-- The file names -->
<xsl:variable name="pi-file" select="processing-instruction('dbhtml')"/> <xsl:variable name="pi-file" select="processing-instruction('dbhtml')"/>
<xsl:variable name="pi-file-value" select="substring-after($pi-file,'filename=')"/> <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')"/> <xsl:variable name="filename" select="substring-before(substring($pi-file-value,2),'.html')"/>
<!-- Creating dirs and files --> <!-- 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 <xsl:text>#!/bin/bash
set +h set +h
set -e set -e
@ -254,7 +254,7 @@ cd $PKGDIR
<xsl:apply-templates <xsl:apply-templates
select=".//screen[not(@role) or @role != 'nodump']/userinput[@remap != 'adjust']" select=".//screen[not(@role) or @role != 'nodump']/userinput[@remap != 'adjust']"
mode="pkgmngt"/> mode="pkgmngt"/>
<xsl:if test="@id = 'ch-system-pkgmngt'"> <xsl:if test="$dirname = 'chapter06'">
<xsl:text>packInstall <xsl:text>packInstall
rm -rf $PKG_DEST rm -rf $PKG_DEST
</xsl:text> </xsl:text>

4
pkgmngt/packageManager.xml
View file

@ -192,7 +192,7 @@ EOF</userinput></screen>
</sect1> </sect1>
<sect1 id="ch-system-pkgmngt-creatingdirs"> <sect1 id="ch-pkgmngt-creatingdirs">
<?dbhtml filename="creatingdirs.html"?> <?dbhtml filename="creatingdirs.html"?>
<title>Adding Directories for package management</title> <title>Adding Directories for package management</title>
@ -209,7 +209,7 @@ mkdir -pv /var/lib/packages</userinput></screen>
</sect1> </sect1>
<sect1 id="ch-system-pkgmngt-createfiles"> <sect1 id="ch-pkgmngt-createfiles">
<?dbhtml filename="createfiles.html"?> <?dbhtml filename="createfiles.html"?>
<title>Adding administrative files for Dpkg</title> <title>Adding administrative files for Dpkg</title>

6
pkgmngt/packageManager.xml.template
View file

@ -81,16 +81,16 @@ EOF</userinput></screen>
<!-- Mandatory section for creating dirs. These instructions are added at the <!-- Mandatory section for creating dirs. These instructions are added at the
end of the creating dirs instructions of the book. Do not change the end of the creating dirs instructions of the book. Do not change the
following line --> 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> --> any explaining <title>Title</title> and <para>explanations</para> -->
<screen><userinput>mkdir -pv /var/{log,lib/dpkg/{info,updates}} <screen><userinput>mkdir -pv /var/{log,lib/dpkg/{info,updates}}
mkdir -pv /var/lib/packages</userinput></screen> mkdir -pv /var/lib/packages</userinput></screen>
</sect1> </sect1>
<!-- Same for files. Do not change the following line --> <!-- 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} <screen><userinput>touch /var/lib/dpkg/{available,status}
touch /var/log/dpkg.log</userinput></screen> touch /var/log/dpkg.log</userinput></screen>