Author: pierre
Date: Sun Dec 21 03:25:47 2014
New Revision: 3816
Log:
Fix 2 minor bugs:
- the tzdata DESTDIR should not be tzdata, because some package managers use
$PACKAGE as their working directory, and this may conflicts with this one.
tzdata DESTDIR is now 001-tzdata
- when reading md5sums, the current code assumes that there is only one
<para><literal> node reachable from ../.. (relative to <ulink>). This is true
for the "official" book, but not necessarily for the snippets written for
package management. The following change only assumes that the md5sum
<para><literal> for a given <ulink> is the first one after <para><ulink>,
which does not change anything for the book, and is better for user
written snippets.
Modified:
jhalfs/trunk/LFS/lfs.xsl
jhalfs/trunk/common/urls.xsl
Modified: jhalfs/trunk/LFS/lfs.xsl
==============================================================================
--- jhalfs/trunk/LFS/lfs.xsl Sat Dec 13 03:10:32 2014 (r3815)
+++ jhalfs/trunk/LFS/lfs.xsl Sun Dec 21 03:25:47 2014 (r3816)
@@ -455,7 +455,7 @@
<xsl:text>
OLD_PKG_DEST=$PKG_DEST
OLD_PKGDIR=$PKGDIR
-PKG_DEST=$(dirname $OLD_PKG_DEST)/tzdata
+PKG_DEST=$(dirname $OLD_PKG_DEST)/001-tzdata
PKGDIR=$(dirname $PKGDIR)/tzdata-</xsl:text>
<xsl:copy-of select="substring-before(
substring-after(string(),'tzdata'),
Modified: jhalfs/trunk/common/urls.xsl
==============================================================================
--- jhalfs/trunk/common/urls.xsl Sat Dec 13 03:10:32 2014 (r3815)
+++ jhalfs/trunk/common/urls.xsl Sun Dec 21 03:25:47 2014 (r3816)
@@ -109,7 +109,7 @@
<xsl:value-of select="$package"/>
<!-- Write MD5SUM value -->
<xsl:text> </xsl:text>
- <xsl:value-of select="../..//para/literal"/>
+ <xsl:value-of select="../following-sibling::para/literal"/>
<xsl:text>
</xsl:text>
</xsl:if>
</xsl:template>
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
