Changeset 229ed25 for BOOK/Makefile

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (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 branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/Makefile (modified) (3 diffs)

BOOK/Makefile

@@ -21 +21 @@
                    sparc sparc64 sparc64-64 \
                    mips mips64 mips64-64 \
-                   ppc ppc64 \
+                   ppc ppc64 ppc64-64 \
                    alpha
 
@@ -198 +198 @@
           $(TOP)/$(arch)-index.xml
 
+ARCHS_MD5LIST := $(ARCHS:%=%-md5list)
+.PHONY: md5-list $(ARCHS_MD5LIST)
+md5-list: $(ARCHS_MD5LIST)
+$(ARCHS_MD5LIST): override arch = $(@:%-md5list=%)
+$(ARCHS_MD5LIST):
+        @echo "Creating md5 hash list for $(arch)..."
+        $(Q)mkdir -p $(DLLISTDIR)
+        $(Q)xsltproc --xinclude --nonet \
+          --output $(DLLISTDIR)/$(arch).md5sum \
+          $(TOP)/stylesheets/md5sum.xsl \
+          $(TOP)/$(arch)-index.xml
+       
 FG_GREEN := $(shell echo -e '\e[0;32m')
 FG_BLUE := $(shell echo -e '\e[0;34m')
@@ -227 +239 @@
         @echo "Download-List Targets"
         @echo "  $(FG_GREEN)download-list $(FG_BLUE)$(ARCHS_DLLIST)$(FG_DEFAULT)"
+        @echo "md5-List Targets"
+        @echo "  $(FG_GREEN)md5-list $(FG_BLUE)$(ARCHS_MD5LIST)$(FG_DEFAULT)"