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

Fix a long standing bug in lfs.xsl, which tried to use packageManager.xml

Browse source 
when Package management was not in use, resulting in errors in
000-masterscript.log
Also correct a typo
This commit is contained in:
Pierre Labastie 2014-11-29 20:43:35 +00:00
parent c5650f96c7
commit e6e0c85db7
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
LFS/lfs.xsl
View file

@ -126,17 +126,19 @@
<xsl:apply-templates select="sect2| <xsl:apply-templates select="sect2|
screen[not(@role) or screen[not(@role) or
@role!='nodump']/userinput"/> @role!='nodump']/userinput"/>
<xsl:if test="@id='ch-system-creatingdirs'"> <xsl:if test="@id='ch-system-creatingdirs' and $pkgmngt='y'">
<xsl:apply-templates <xsl:apply-templates
select="document('packageManager.xml')//sect1[ select="document('packageManager.xml')//sect1[
@id='ch-pkgmngt-creatingdirs' @id='ch-pkgmngt-creatingdirs'
]//userinput"/> ]//userinput"
mode="pkgmngt"/>
</xsl:if> </xsl:if>
<xsl:if test="@id='ch-system-createfiles'"> <xsl:if test="@id='ch-system-createfiles' and $pkgmngt='y'">
<xsl:apply-templates <xsl:apply-templates
select="document('packageManager.xml')//sect1[ select="document('packageManager.xml')//sect1[
@id='ch-pkgmngt-createfiles' @id='ch-pkgmngt-createfiles'
]//userinput"/> ]//userinput"
mode="pkgmngt"/>
</xsl:if> </xsl:if>
<xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text> <xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text>
<xsl:text>exit&#xA;</xsl:text> <xsl:text>exit&#xA;</xsl:text>
@ -532,7 +534,7 @@ exit
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:text>make DESTDIR=$PKG_DEST</xsl:text> <xsl:text>make DESTDIR=$PKG_DEST</xsl:text>
<xsl:call-template name="outputpkgdest">> <xsl:call-template name="outputpkgdest">
<xsl:with-param <xsl:with-param
name="outputstring" name="outputstring"
select="substring-after($outputstring,'make')"/> select="substring-after($outputstring,'make')"/>