Opened 6 years ago
Closed 6 years ago
#4339 closed defect (fixed)
Wrong input for wget-list in Makefile
Reported by: | thomas | Owned by: | lfs-book |
---|---|---|---|
Priority: | low | Milestone: | 8.3 |
Component: | Book | Version: | SVN |
Severity: | minor | Keywords: | |
Cc: |
Description
In the Makefile there is the section
wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \ packages.ent patches.ent @echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..." $(Q)mkdir -p $(BASEDIR) $(Q)xsltproc --nonet --xinclude \ --stringparam profile.revision $(REV) \ --output $(RENDERTMP)/sysd-wget.xml \ stylesheets/lfs-xsl/profile.xsl \ chapter03/chapter03.xml $(Q)xsltproc --xinclude --nonet \ --output $(BASEDIR)/wget-list \ stylesheets/wget-list.xsl \ chapter03/chapter03.xml
shouldn't the last xslproc use "sysd-wget.xml" as input? It would than read as:
wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \ packages.ent patches.ent @echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..." $(Q)mkdir -p $(BASEDIR) $(Q)xsltproc --nonet --xinclude \ --stringparam profile.revision $(REV) \ --output $(RENDERTMP)/sysd-wget.xml \ stylesheets/lfs-xsl/profile.xsl \ chapter03/chapter03.xml $(Q)xsltproc --xinclude --nonet \ --output $(BASEDIR)/wget-list \ stylesheets/wget-list.xsl \ $(RENDERTMP)/sysd-wget.xml
A patch would look like:
--- Makefile.orig 2018-08-20 14:05:17.206025624 +0200 +++ Makefile 2018-08-20 14:05:55.919230588 +0200 @@ -167,7 +167,7 @@ $(Q)xsltproc --xinclude --nonet \ --output $(BASEDIR)/wget-list \ stylesheets/wget-list.xsl \ - chapter03/chapter03.xml + $(RENDERTMP)/sysd-wget.xml md5sums: $(BASEDIR)/md5sums $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
Change History (6)
comment:1 by , 6 years ago
comment:2 by , 6 years ago
Ok, understand that. But than, the output of the first xsltproc (xsltproc ... --output $(RENDERTMP)/sysd-wget.xml ...) is not used anywhere. At least not in the Makefile.
comment:3 by , 6 years ago
I do not have that. I don't have wget.xml anywhere in the Makefile.
wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list: $(RENDERTMP)/$(BLFSFULL) @echo "Generating wget list for $(REV) at $(BASEDIR)/wget-list ..." $(Q)mkdir -p $(BASEDIR) $(Q)xsltproc --nonet \ --output $(BASEDIR)/wget-list \ stylesheets/wget-list.xsl \ $(RENDERTMP)/$(BLFSFULL)
comment:4 by , 6 years ago
http://wiki.linuxfromscratch.org/lfs/browser/trunk/BOOK/Makefile line 161+
ah, just saw that apparently you looked in BLFS's Makefile. Here it is about the LFS's Makefile
comment:5 by , 6 years ago
Yes, I was looking at BLFS. I don't think the first xsltproc is needed. I'll comment it out.
We purposely use the same list for both the systemd and System V books. For sysv, that means downloading two packages that are not used, systemd{,-manpages} and dbus. For sysd it means downloading eudev (and the Udev-lfs Tarball), lfs-bootscripts, sysklogd, and sysviinit.
The sizes of the extra files are small, about 9 MB for sysv and about 2 MB for systemd.
This gives flexibility to the user to build either book after a single wget. The consolidated set of packages is also available at different mirrors such as ftp://ftp.lfs-matrix.net/pub/lfs/lfs-packages/
The consolidated file is also used when running the daily currency checks.