gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-18 19:29:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Xi Ruoyao 2022-06-21 15:17:03 +08:00
parent c7b29be1c1
commit ca22630e6a
No known key found for this signature in database
GPG Key ID: ACAAD20E19E710E3
3 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile
View File

@ -151,39 +151,45 @@ profile-html:
stylesheets/lfs-xsl/profile.xsl \ stylesheets/lfs-xsl/profile.xsl \
$(RENDERTMP)/lfs-full.xml $(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 \ $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
packages.ent patches.ent general.ent packages.ent patches.ent general.ent
@echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..." @echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
$(Q)mkdir -p $(BASEDIR) $(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 \ $(Q)xsltproc --xinclude --nonet \
--output $(BASEDIR)/wget-list \ --output $(BASEDIR)/wget-list \
stylesheets/wget-list.xsl \ stylesheets/wget-list.xsl \
chapter03/chapter03.xml 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 md5sums: $(BASEDIR)/md5sums
$(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \ $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
packages.ent patches.ent packages.ent patches.ent
@echo "Generating consolidated md5sum file at $(BASEDIR)/md5sums ..." @echo "Generating consolidated md5sum file at $(BASEDIR)/md5sums ..."
$(Q)mkdir -p $(BASEDIR) $(Q)mkdir -p $(BASEDIR)
$(Q)xsltproc --nonet --xinclude \ $(Q)xsltproc --nonet --xinclude \
--stringparam profile.revision $(REV) \ --stringparam profile.revision $(REV) \
--output $(RENDERTMP)/sysv-md5sum.xml \ --output $(RENDERTMP)/md5sum.xml \
stylesheets/lfs-xsl/profile.xsl \ stylesheets/lfs-xsl/profile.xsl \
chapter03/chapter03.xml chapter03/chapter03.xml
$(Q)xsltproc --xinclude --nonet \ $(Q)xsltproc --xinclude --nonet \
--output $(BASEDIR)/md5sums \ --output $(BASEDIR)/md5sums \
stylesheets/md5sum.xsl \ stylesheets/md5sum.xsl \
$(RENDERTMP)/sysv-md5sum.xml $(RENDERTMP)/md5sum.xml
$(Q)sed -i -e \ $(Q)sed -i -e \
"s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.xz | cut -d' ' -f1)/" \ "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.xz | cut -d' ' -f1)/" \
$(BASEDIR)/md5sums $(BASEDIR)/md5sums

10
chapter03/introduction.xml
View File

@ -79,11 +79,11 @@
</itemizedlist> </itemizedlist>
<para>To download all of the packages and patches by using <para>To download all of the packages and patches by using
<ulink url="../wget-list">wget-list</ulink> as an input to the <ulink url="../&wget-list;">&wget-list;</ulink>
<command>wget</command> command, use:</para> 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> <note><para>
The <filename>wget-list</filename> file mentioned above retrieves all The <filename>wget-list</filename> file mentioned above retrieves all
packages for both the sysV and systemd versions of LFS. There are a total 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 <filename>md5sums</filename> file mentioned below is specific to the
current book. current book.
</para></note> </para></note>
-->
<para>Additionally, starting with LFS-7.0, there is a separate file, <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 <ulink url="../md5sums">md5sums</ulink>, which can be used to verify that all
the correct packages are available before proceeding. Place that file in the correct packages are available before proceeding. Place that file in

7
general.ent
View File

@ -72,6 +72,13 @@
<!ENTITY copyrightdate "%crdate;"> <!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 lfs-root "https://www.linuxfromscratch.org/">
<!ENTITY blfs-root "&lfs-root;blfs/"> <!ENTITY blfs-root "&lfs-root;blfs/">
<!ENTITY blfs-book "&blfs-root;view/&short-version;/"> <!ENTITY blfs-book "&blfs-root;view/&short-version;/">