Changeset e15b03b for Makefile

Timestamp:

06/26/2022 06:36:09 PM (22 months ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

dcb4788f

Parents:

4605657 (diff), c500323 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge upstream

File:

• Makefile (modified) (2 diffs)

Makefile

@@ -166 +166 @@
                      $(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
@@ -189 +195 @@
         $(Q)mkdir -p $(BASEDIR)
 
-        $(Q)xsltproc --nonet --xinclude                    \
+        $(Q)xsltproc --nonet --xinclude                   \
                 --stringparam profile.revision $(REV) \
                 --stringparam profile.arch $(ARCH)    \
-                --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)/" \