Hi,
Here is a patch to improve wget-list and md5sums generation. Note that
it gives the same result as before for md5sums (but the information
given while running make is improved, and the target depends on the
correct stylesheet). For wget-list, it also fixes the content of
wget-list, which was always the whole set of packages, independant on
the setting of REV. I have also changed the names of intermediate files,
but feel free to drop that...
Regards
Pierre
Index: lfsbook/Makefile
===================================================================
--- lfsbook.orig/Makefile
+++ lfsbook/Makefile
@@ -152,36 +152,36 @@ profile-html:
wget-list: $(BASEDIR)/wget-list
$(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
packages.ent patches.ent
- @echo "Generating wget list for sysv at $(BASEDIR)/wget-list ..."
+ @echo "Generating wget list for $(REV) at $(BASEDIR)/wget-list ..."
$(Q)mkdir -p $(BASEDIR)
$(Q)xsltproc --nonet --xinclude \
--stringparam profile.revision $(REV) \
- --output $(RENDERTMP)/sysd-wget.xml \
+ --output $(RENDERTMP)/wget-rev.xml \
stylesheets/lfs-xsl/profile.xsl \
chapter03/chapter03.xml
$(Q)xsltproc --xinclude --nonet \
--output $(BASEDIR)/wget-list \
stylesheets/wget-list.xsl \
- chapter03/chapter03.xml
+ $(RENDERTMP)/wget-rev.xml
md5sums: $(BASEDIR)/md5sums
-$(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
+$(BASEDIR)/md5sums: stylesheets/md5sum.xsl chapter03/chapter03.xml \
packages.ent patches.ent
- @echo "Generating md5sum file for sysv at $(BASEDIR)/md5sums ..."
+ @echo "Generating md5sum file for $(REV) at $(BASEDIR)/md5sums ..."
$(Q)mkdir -p $(BASEDIR)
$(Q)xsltproc --nonet --xinclude \
--stringparam profile.revision $(REV) \
- --output $(RENDERTMP)/sysv-md5sum.xml \
+ --output $(RENDERTMP)/md5sum-rev.xml \
stylesheets/lfs-xsl/profile.xsl \
chapter03/chapter03.xml
$(Q)xsltproc --xinclude --nonet \
--output $(BASEDIR)/md5sums \
stylesheets/md5sum.xsl \
- $(RENDERTMP)/sysv-md5sum.xml
+ $(RENDERTMP)/md5sum-rev.xml
$(Q)sed -i -e \
"s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.bz2 | cut -d' ' -f1)/" \
$(BASEDIR)/md5sums
--
http://lists.linuxfromscratch.org/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
