History

Drastically improve make dependency resolution

Michael Aldridge committed 9 years ago

Commit aa0920f1 parent bc6d4321 file · +18 −15Browse files

Unified · Split

Makefile+18−15
@@ -47,19 +47,24 @@ dist: distdir-$(DATE) · 46 unmodified lines
47rootfs-all: $(ALL_ROOTFS)47rootfs-all: $(ALL_ROOTFS)
48 48
49rootfs-all-print:49rootfs-all-print:
50 echo $(ALL_ROOTFS)50 @echo $(ALL_ROOTFS) | sed "s: :\n:g"
51 51
52void-%-ROOTFS-$(DATE).tar.xz: $(SCRIPTS)52void-%-ROOTFS-$(DATE).tar.xz: $(SCRIPTS)
53 $(SUDO) ./mkrootfs.sh $(XBPS_REPOSITORY) -x $(COMPRESSOR_THREADS) $*53 $(SUDO) ./mkrootfs.sh $(XBPS_REPOSITORY) -x $(COMPRESSOR_THREADS) $*
54 54
55void-%-PLATFORMFS-$(DATE).tar.xz: $(SCRIPTS)
56 $(SUDO) ./mkplatformfs.sh $(XBPS_REPOSITORY) -x $(COMPRESSOR_THREADS) $* void-$(shell ./lib.sh platform2arch $*)-ROOTFS-$(DATE).tar.xz
57
58platformfs-all: rootfs-all $(ALL_PLATFORMFS)55platformfs-all: rootfs-all $(ALL_PLATFORMFS)
59 56
60platformfs-all-print:57platformfs-all-print:
61 @echo $(ALL_PLATFORMFS) | sed "s: :\n:g"58 @echo $(ALL_PLATFORMFS) | sed "s: :\n:g"
62 59
60void-%-PLATFORMFS-$(DATE).tar.xz: $(SCRIPTS) platformfs-%-helper
61 $(SUDO) ./mkplatformfs.sh $(XBPS_REPOSITORY) -x $(COMPRESSOR_THREADS) $* void-$(shell ./lib.sh platform2arch $*)-ROOTFS-$(DATE).tar.xz
62
63platformfs-%-helper:
64# This rule exists because you can't do the shell expansion in the
65# dependent rule resolution stage
66 $(MAKE) void-$(shell ./lib.sh platform2arch $*)-ROOTFS-$(DATE).tar.xz
67
63images-all: platformfs-all images-all-sbc images-all-cloud68images-all: platformfs-all images-all-sbc images-all-cloud
64 69
65images-all-sbc: $(ALL_SBC_IMAGES)70images-all-sbc: $(ALL_SBC_IMAGES)
@@ -67,24 +72,22 @@ images-all-sbc: $(ALL_SBC_IMAGES) · 1 unmodified line
67images-all-cloud: $(ALL_CLOUD_IMAGES)72images-all-cloud: $(ALL_CLOUD_IMAGES)
68 73
69images-all-print:74images-all-print:
70 @echo $(ALL_SBC_IMAGES) $(ALL_CLOUD_IMAGES)75 @echo $(ALL_SBC_IMAGES) $(ALL_CLOUD_IMAGES) | sed "s: :\n:g"
71 76
72void-%-$(DATE).img.xz:77void-%-$(DATE).img.xz: void-%-PLATFORMFS-$(DATE).tar.xz
73 $(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-$*-PLATFORMFS-$(DATE).tar.xz78 $(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-$*-PLATFORMFS-$(DATE).tar.xz
74 79
75# The GCP images are special for $reasons80# Some of the images MUST be compressed with gzip rather than xz, this
76void-GCP-$(DATE).tar.gz:81# rule services those images.
77 $(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-GCP-PLATFORMFS-$(DATE).tar.xz82void-%-$(DATE).tar.gz: void-%-PLATFORMFS-$(DATE).tar.xz
78 83 $(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-$*-PLATFORMFS-$(DATE).tar.xz
79void-GCP-musl-$(DATE).tar.gz:
80 $(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-GCP-musl-PLATFORMFS-$(DATE).tar.xz
81 84
82pxe-all: $(ALL_PXE_ARCHS)85pxe-all: $(ALL_PXE_ARCHS)
83 86
84pxe-all-print:87pxe-all-print:
85 @echo $(ALL_PXE_ARCHS)88 @echo $(ALL_PXE_ARCHS) | sed "s: :\n:g"
86 89
87void-%-NETBOOT-$(DATE).tar.gz: $(SCRIPTS)90void-%-NETBOOT-$(DATE).tar.gz: $(SCRIPTS) void-%-ROOTFS-$(DATE).tar.xz
88 $(SUDO) ./mknet.sh void-$*-ROOTFS-$(DATE).tar.xz91 $(SUDO) ./mknet.sh void-$*-ROOTFS-$(DATE).tar.xz
89 92
90.PHONY: clean dist rootfs-all-print platformfs-all-print pxe-all-print93.PHONY: clean dist rootfs-all-print platformfs-all-print pxe-all-print platformfs-%-helper

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t