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

Allows to retrieve package from SRC_ARCHIVE, in case it is not already there

Browse source 
and is in archive. This should not happen in normal operation, but may happen
    in func_install_blfs
This commit is contained in:
Pierre Labastie 2017-03-16 12:45:11 +00:00
parent 50618eeb88
commit 54380e5020
1 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
BLFS/xsl/scripts.xsl
View file

@ -228,26 +228,16 @@ cd $UNPACKDIR

<xsl:value-of select="$package"/> <xsl:value-of select="$package"/>
<xsl:text>&#xA;if [[ ! -f $</xsl:text> <xsl:text>&#xA;if [[ ! -f $</xsl:text>
<xsl:value-of select="$varname"/> <xsl:value-of select="$varname"/>
<xsl:text> ]] ; then&#xA;</xsl:text> <xsl:text> ]] ; then
<!-- This whole code becomes obsolete because now, it is there or we if [[ -f $SRC_ARCHIVE/$</xsl:text>
download; keeping for now, and we may want to grab it from
SRC_ARCHIVE when SRC_SUBDIRS is set...
<xsl:text> if [[ -f $SRC_ARCHIVE/$PKG_DIR/$</xsl:text>
<xsl:value-of select="$varname"/>
<xsl:text> ]] ; then&#xA;</xsl:text>
<xsl:text> cp $SRC_ARCHIVE/$PKG_DIR/$</xsl:text>
<xsl:value-of select="$varname"/>
<xsl:text> $</xsl:text>
<xsl:value-of select="$varname"/>
<xsl:text>&#xA;</xsl:text>
<xsl:text> elif [[ -f $SRC_ARCHIVE/$</xsl:text>
<xsl:value-of select="$varname"/> <xsl:value-of select="$varname"/>
<xsl:text> ]] ; then&#xA;</xsl:text> <xsl:text> ]] ; then&#xA;</xsl:text>
<xsl:text> cp $SRC_ARCHIVE/$</xsl:text> <xsl:text> cp $SRC_ARCHIVE/$</xsl:text>
<xsl:value-of select="$varname"/> <xsl:value-of select="$varname"/>
<xsl:text> $</xsl:text> <xsl:text> $</xsl:text>
<xsl:value-of select="$varname"/> <xsl:value-of select="$varname"/>
<xsl:text>&#xA; else&#xA;</xsl:text> --> <xsl:text>
else&#xA;</xsl:text>
<!-- Download from upstream http --> <!-- Download from upstream http -->
<xsl:if test="string-length($httpurl) &gt; 10"> <xsl:if test="string-length($httpurl) &gt; 10">
<xsl:text> wget -T 30 -t 5 </xsl:text> <xsl:text> wget -T 30 -t 5 </xsl:text>
@ -265,11 +255,11 @@ cd $UNPACKDIR&#xA;
<xsl:value-of select="$first_letter"/> <xsl:value-of select="$first_letter"/>
<xsl:text>/$</xsl:text> <xsl:text>/$</xsl:text>
<xsl:value-of select="$varname"/> <xsl:value-of select="$varname"/>
<xsl:text> <xsl:text><!--
<!-- cp $</xsl:text> cp $</xsl:text>
<xsl:value-of select="$varname"/> <xsl:value-of select="$varname"/>
<xsl:text> $SRC_ARCHIVE <xsl:text> $SRC_ARCHIVE-->
fi--> fi
fi fi
</xsl:text> </xsl:text>
<xsl:if test="string-length($md5) &gt; 10"> <xsl:if test="string-length($md5) &gt; 10">
@ -283,8 +273,7 @@ fi
<!-- link additional packages into $BUILD_DIR, because they are supposed to <!-- link additional packages into $BUILD_DIR, because they are supposed to
be there--> be there-->
<xsl:if test="string($varname) != 'PACKAGE'"> <xsl:if test="string($varname) != 'PACKAGE'">
<xsl:text> <xsl:text>[[ "$SRC_DIR" != "$BUILD_DIR" ]] &amp;&amp; ln -sf $SRC_DIR/$</xsl:text>
[[ "$SRC_DIR" != "$BUILD_DIR" ]] &amp;&amp; ln -sf $SRC_DIR/$</xsl:text>
<xsl:value-of select="$varname"/> <xsl:value-of select="$varname"/>
<xsl:text> $BUILD_DIR <xsl:text> $BUILD_DIR
</xsl:text> </xsl:text>