Author: pierre Date: Thu Mar 16 05:45:11 2017 New Revision: 3920 Log: Allows to retrieve package from SRC_ARCHIVE, in case it is not already there and is in archive. This should not happen in normal operation, but may happen in func_install_blfs
Modified: jhalfs/branches/new_features/BLFS/xsl/scripts.xsl Modified: jhalfs/branches/new_features/BLFS/xsl/scripts.xsl ============================================================================== --- jhalfs/branches/new_features/BLFS/xsl/scripts.xsl Wed Mar 15 14:06:17 2017 (r3919) +++ jhalfs/branches/new_features/BLFS/xsl/scripts.xsl Thu Mar 16 05:45:11 2017 (r3920) @@ -228,48 +228,38 @@ <xsl:value-of select="$package"/> <xsl:text>
if [[ ! -f $</xsl:text> <xsl:value-of select="$varname"/> - <xsl:text> ]] ; then
</xsl:text> - <!-- This whole code becomes obsolete because now, it is there or we - 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
</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>
</xsl:text> - <xsl:text> elif [[ -f $SRC_ARCHIVE/$</xsl:text> + <xsl:text> ]] ; then + if [[ -f $SRC_ARCHIVE/$</xsl:text> <xsl:value-of select="$varname"/> <xsl:text> ]] ; then
</xsl:text> <xsl:text> cp $SRC_ARCHIVE/$</xsl:text> <xsl:value-of select="$varname"/> <xsl:text> $</xsl:text> <xsl:value-of select="$varname"/> - <xsl:text>
 else
</xsl:text> --> + <xsl:text> + else
</xsl:text> <!-- Download from upstream http --> <xsl:if test="string-length($httpurl) > 10"> - <xsl:text> wget -T 30 -t 5 </xsl:text> + <xsl:text> wget -T 30 -t 5 </xsl:text> <xsl:value-of select="$httpurl"/> <xsl:text> ||
</xsl:text> </xsl:if> <!-- Download from upstream ftp --> <xsl:if test="string-length($ftpurl) > 10"> - <xsl:text> wget -T 30 -t 5 </xsl:text> + <xsl:text> wget -T 30 -t 5 </xsl:text> <xsl:value-of select="$ftpurl"/> <xsl:text> ||
</xsl:text> </xsl:if> <!-- The FTP_SERVER mirror as a last resort --> - <xsl:text> wget -T 30 -t 5 ${FTP_SERVER}svn/</xsl:text> + <xsl:text> wget -T 30 -t 5 ${FTP_SERVER}svn/</xsl:text> <xsl:value-of select="$first_letter"/> <xsl:text>/$</xsl:text> <xsl:value-of select="$varname"/> - <xsl:text> -<!-- cp $</xsl:text> + <xsl:text><!-- + cp $</xsl:text> <xsl:value-of select="$varname"/> - <xsl:text> $SRC_ARCHIVE - fi--> + <xsl:text> $SRC_ARCHIVE--> + fi fi </xsl:text> <xsl:if test="string-length($md5) > 10"> @@ -283,8 +273,7 @@ <!-- link additional packages into $BUILD_DIR, because they are supposed to be there--> <xsl:if test="string($varname) != 'PACKAGE'"> - <xsl:text> -[[ "$SRC_DIR" != "$BUILD_DIR" ]] && ln -sf $SRC_DIR/$</xsl:text> + <xsl:text>[[ "$SRC_DIR" != "$BUILD_DIR" ]] && ln -sf $SRC_DIR/$</xsl:text> <xsl:value-of select="$varname"/> <xsl:text> $BUILD_DIR </xsl:text> -- http://lists.linuxfromscratch.org/listinfo/alfs-log Unsubscribe: See the above information page