diff options
| -rw-r--r-- | Makefile | 30 | ||||
| -rw-r--r-- | chapter03/introduction.xml | 10 | ||||
| -rw-r--r-- | general.ent | 7 |
3 files changed, 30 insertions, 17 deletions
@@ -151,39 +151,45 @@ profile-html: stylesheets/lfs-xsl/profile.xsl \ $(RENDERTMP)/lfs-full.xml -wget-list: $(BASEDIR)/wget-list +wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list-$(REV) $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \ packages.ent patches.ent general.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 +$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl \ + chapter03/chapter03.xml \ + packages.ent patches.ent general.ent + $(Q)xsltproc --nonet --xinclude \ + --stringparam profile.revision $(REV) \ + --output $(RENDERTMP)/wget-list.xml \ + stylesheets/lfs-xsl/profile.xsl \ + chapter03/chapter03.xml + $(Q)xsltproc --xinclude --nonet \ + --output $(BASEDIR)/wget-list-$(REV) \ + stylesheets/wget-list.xsl \ + $(RENDERTMP)/wget-list.xml + md5sums: $(BASEDIR)/md5sums $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \ packages.ent patches.ent @echo "Generating consolidated md5sum file at $(BASEDIR)/md5sums ..." $(Q)mkdir -p $(BASEDIR) - $(Q)xsltproc --nonet --xinclude \ + $(Q)xsltproc --nonet --xinclude \ --stringparam profile.revision $(REV) \ - --output $(RENDERTMP)/sysv-md5sum.xml \ + --output $(RENDERTMP)/md5sum.xml \ stylesheets/lfs-xsl/profile.xsl \ chapter03/chapter03.xml - $(Q)xsltproc --xinclude --nonet \ + $(Q)xsltproc --xinclude --nonet \ --output $(BASEDIR)/md5sums \ stylesheets/md5sum.xsl \ - $(RENDERTMP)/sysv-md5sum.xml + $(RENDERTMP)/md5sum.xml $(Q)sed -i -e \ "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.xz | cut -d' ' -f1)/" \ $(BASEDIR)/md5sums diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml index bc95ed071..76fd5ee12 100644 --- a/chapter03/introduction.xml +++ b/chapter03/introduction.xml @@ -79,11 +79,11 @@ </itemizedlist> <para>To download all of the packages and patches by using - <ulink url="../wget-list">wget-list</ulink> as an input to the - <command>wget</command> command, use:</para> - -<screen role="nodump"><userinput>wget --input-file=wget-list --continue --directory-prefix=$LFS/sources</userinput></screen> + <ulink url="../&wget-list;">&wget-list;</ulink> + as an input to the <command>wget</command> command, use:</para> +<screen role="nodump"><userinput>wget --input-file=&wget-list; --continue --directory-prefix=$LFS/sources</userinput></screen> +<!-- <note><para> The <filename>wget-list</filename> file mentioned above retrieves all packages for both the sysV and systemd versions of LFS. There are a total @@ -91,7 +91,7 @@ <filename>md5sums</filename> file mentioned below is specific to the current book. </para></note> - +--> <para>Additionally, starting with LFS-7.0, there is a separate file, <ulink url="../md5sums">md5sums</ulink>, which can be used to verify that all the correct packages are available before proceeding. Place that file in diff --git a/general.ent b/general.ent index 7da71e60e..f378f7e20 100644 --- a/general.ent +++ b/general.ent @@ -72,6 +72,13 @@ <!ENTITY copyrightdate "%crdate;"> ]]> +<![ %sysv; [ +<!ENTITY wget-list "wget-list-sysv"> +]]> +<![ %systemd; [ +<!ENTITY wget-list "wget-list-systemd"> +]]> + <!ENTITY lfs-root "https://www.linuxfromscratch.org/"> <!ENTITY blfs-root "&lfs-root;blfs/"> <!ENTITY blfs-book "&blfs-root;view/&short-version;/"> |