Unified · Split
| @@ -47,19 +47,24 @@ dist: distdir-$(DATE) · 46 unmodified lines | ||
| 47 | 47 | rootfs-all: $(ALL_ROOTFS) |
| 48 | 48 | |
| 49 | 49 | rootfs-all-print: |
| 50 | − echo $(ALL_ROOTFS) | |
| 50 | + @echo $(ALL_ROOTFS) | sed "s: :\n:g" | |
| 51 | 51 | |
| 52 | 52 | void-%-ROOTFS-$(DATE).tar.xz: $(SCRIPTS) |
| 53 | 53 | $(SUDO) ./mkrootfs.sh $(XBPS_REPOSITORY) -x $(COMPRESSOR_THREADS) $* |
| 54 | 54 | |
| 55 | −void-%-PLATFORMFS-$(DATE).tar.xz: $(SCRIPTS) | |
| 56 | − $(SUDO) ./mkplatformfs.sh $(XBPS_REPOSITORY) -x $(COMPRESSOR_THREADS) $* void-$(shell ./lib.sh platform2arch $*)-ROOTFS-$(DATE).tar.xz | |
| 57 | − | |
| 58 | 55 | platformfs-all: rootfs-all $(ALL_PLATFORMFS) |
| 59 | 56 | |
| 60 | 57 | platformfs-all-print: |
| 61 | 58 | @echo $(ALL_PLATFORMFS) | sed "s: :\n:g" |
| 62 | 59 | |
| 60 | +void-%-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 | + | |
| 63 | +platformfs-%-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 | + | |
| 63 | 68 | images-all: platformfs-all images-all-sbc images-all-cloud |
| 64 | 69 | |
| 65 | 70 | images-all-sbc: $(ALL_SBC_IMAGES) |
| @@ -67,24 +72,22 @@ images-all-sbc: $(ALL_SBC_IMAGES) · 1 unmodified line | ||
| 67 | 72 | images-all-cloud: $(ALL_CLOUD_IMAGES) |
| 68 | 73 | |
| 69 | 74 | images-all-print: |
| 70 | − @echo $(ALL_SBC_IMAGES) $(ALL_CLOUD_IMAGES) | |
| 75 | + @echo $(ALL_SBC_IMAGES) $(ALL_CLOUD_IMAGES) | sed "s: :\n:g" | |
| 71 | 76 | |
| 72 | −void-%-$(DATE).img.xz: | |
| 77 | +void-%-$(DATE).img.xz: void-%-PLATFORMFS-$(DATE).tar.xz | |
| 73 | 78 | $(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-$*-PLATFORMFS-$(DATE).tar.xz |
| 74 | 79 | |
| 75 | −# The GCP images are special for $reasons | |
| 76 | −void-GCP-$(DATE).tar.gz: | |
| 77 | − $(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-GCP-PLATFORMFS-$(DATE).tar.xz | |
| 78 | − | |
| 79 | −void-GCP-musl-$(DATE).tar.gz: | |
| 80 | − $(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-GCP-musl-PLATFORMFS-$(DATE).tar.xz | |
| 80 | +# Some of the images MUST be compressed with gzip rather than xz, this | |
| 81 | +# rule services those images. | |
| 82 | +void-%-$(DATE).tar.gz: void-%-PLATFORMFS-$(DATE).tar.xz | |
| 83 | + $(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-$*-PLATFORMFS-$(DATE).tar.xz | |
| 81 | 84 | |
| 82 | 85 | pxe-all: $(ALL_PXE_ARCHS) |
| 83 | 86 | |
| 84 | 87 | pxe-all-print: |
| 85 | − @echo $(ALL_PXE_ARCHS) | |
| 88 | + @echo $(ALL_PXE_ARCHS) | sed "s: :\n:g" | |
| 86 | 89 | |
| 87 | −void-%-NETBOOT-$(DATE).tar.gz: $(SCRIPTS) | |
| 90 | +void-%-NETBOOT-$(DATE).tar.gz: $(SCRIPTS) void-%-ROOTFS-$(DATE).tar.xz | |
| 88 | 91 | $(SUDO) ./mknet.sh void-$*-ROOTFS-$(DATE).tar.xz |
| 89 | 92 | |
| 90 | −.PHONY: clean dist rootfs-all-print platformfs-all-print pxe-all-print | |
| 93 | +.PHONY: clean dist rootfs-all-print platformfs-all-print pxe-all-print platformfs-%-helper | |