Changeset ca22630

Timestamp:

06/21/2022 07:22:27 AM (2 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 12.2, 12.2-rc1, bdubbs/gcc13, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

0c0b882

Parents:

c7b29be

git-author:

Xi Ruoyao <xry111@…> (06/21/2022 07:17:03 AM)

git-committer:

Xi Ruoyao <xry111@…> (06/21/2022 07:22:27 AM)

Message:

provide revision-specific wget-list-$(REV) file

It's irrational to force a sysv builder to download systemd, or vice
versa. But we cannot simply make wget-list specific for revision: IIRC
the wget-list file with all packages in either revision is used by some
scripts on rivendell. So we keep wget-list as is, and provide a new
wget-list-$(REV) file which only contains the packages for one revision.

Files:

• Makefile (modified) (2 diffs)
• chapter03/introduction.xml (modified) (2 diffs)
• general.ent (modified) (1 diff)

Makefile

@@ -152 +152 @@
                      $(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
@@ -175 +181 @@
         $(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)/" \

chapter03/introduction.xml

@@ -80 +80 @@
 
   <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>
+  <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>
-
+<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
@@ -92 +92 @@
     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

general.ent

@@ -73 +73 @@
 ]]>
 
+<![ %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/">