Makefile: various changes to make CI easier

- made more things externally settable
- added a target for checksumming
- platformfs targets require the respective rootfs
- if the env var $CI is set (automatic in github CI), prints github ci
  magic strings for grouping output
- added targets for building live isos

Author: classabbyamp

Makefile

@@ -1,7 +1,8 @@
-SCRIPTS += $(shell find -type f -name '*.sh')
-DATECODE=$(shell date "+%Y%m%d")
+DATECODE:=$(shell date -u "+%Y%m%d")
 SHELL=/bin/bash
 
+T_LIVE_ARCHS=i686 x86_64{,-musl}
+
 T_PLATFORMS=rpi-{armv{6,7}l,aarch64}{,-musl} beaglebone{,-musl} cubieboard2{,-musl} odroid-c2{,-musl} GCP{,-musl} pinebookpro{,-musl}
 T_ARCHS=i686 x86_64{,-musl} armv{6,7}l{,-musl} aarch64{,-musl}
 
@@ -10,12 +11,15 @@ T_CLOUD_IMGS=GCP{,-musl}
 
 T_PXE_ARCHS=x86_64{,-musl}
 
-ARCHS=$(shell echo $(T_ARCHS))
-PLATFORMS=$(shell echo $(T_PLATFORMS))
-SBC_IMGS=$(shell echo $(T_SBC_IMGS))
-CLOUD_IMGS=$(shell echo $(T_CLOUD_IMGS))
-PXE_ARCHS=$(shell echo $(T_PXE_ARCHS))
+LIVE_ARCHS:=$(shell echo $(T_LIVE_ARCHS))
+LIVE_FLAVORS:=base enlightenment xfce mate cinnamon gnome kde lxde lxqt
+ARCHS:=$(shell echo $(T_ARCHS))
+PLATFORMS:=$(shell echo $(T_PLATFORMS))
+SBC_IMGS:=$(shell echo $(T_SBC_IMGS))
+CLOUD_IMGS:=$(shell echo $(T_CLOUD_IMGS))
+PXE_ARCHS:=$(shell echo $(T_PXE_ARCHS))
 
+ALL_LIVE_ISO=$(foreach arch,$(LIVE_ARCHS), $(foreach flavor,$(LIVE_FLAVORS),void-live-$(arch)-$(DATECODE)-$(flavor).iso))
 ALL_ROOTFS=$(foreach arch,$(ARCHS),void-$(arch)-ROOTFS-$(DATECODE).tar.xz)
 ALL_PLATFORMFS=$(foreach platform,$(PLATFORMS),void-$(platform)-PLATFORMFS-$(DATECODE).tar.xz)
 ALL_SBC_IMAGES=$(foreach platform,$(SBC_IMGS),void-$(platform)-$(DATECODE).img.xz)
@@ -24,32 +28,51 @@ ALL_PXE_ARCHS=$(foreach arch,$(PXE_ARCHS),void-$(arch)-NETBOOT-$(DATECODE).tar.g
 
 SUDO := sudo
 
-XBPS_REPOSITORY := -r https://repo-default.voidlinux.org/current -r https://repo-default.voidlinux.org/current/musl -r https://repo-default.voidlinux.org/current/aarch64
-COMPRESSOR_THREADS=2
+REPOSITORY := https://repo-default.voidlinux.org/current
+XBPS_REPOSITORY := -r $(REPOSITORY) -r $(REPOSITORY)/musl -r $(REPOSITORY)/aarch64
+COMPRESSOR_THREADS:=2
 
 all:
 
+checksum: dist
+	cd distdir-$(DATECODE)/ && sha256 * > sha256sum.txt
+
 distdir-$(DATECODE):
 	mkdir -p distdir-$(DATECODE)
 
 dist: distdir-$(DATECODE)
 	mv void*$(DATECODE)* distdir-$(DATECODE)/
 
+live-iso-all: $(ALL_LIVE_ISO)
+
+live-iso-all-print:
+	@echo $(ALL_LIVE_ISO) | sed "s: :\n:g"
+
+void-live-%.iso:
+	@[ -n "${CI}" ] && printf "::group::\x1b[32mBuilding $@...\x1b[0m\n" || true
+	$(SUDO) ./build-x86-images.sh -r $(REPOSITORY) -t $*
+	@[ -n "${CI}" ] && printf '::endgroup::\n' || true
+
 rootfs-all: $(ALL_ROOTFS)
 
 rootfs-all-print:
 	@echo $(ALL_ROOTFS) | sed "s: :\n:g"
 
-void-%-ROOTFS-$(DATECODE).tar.xz: $(SCRIPTS)
+void-%-ROOTFS-$(DATECODE).tar.xz:
+	@[ -n "${CI}" ] && printf "::group::\x1b[32mBuilding $@...\x1b[0m\n" || true
 	$(SUDO) ./mkrootfs.sh $(XBPS_REPOSITORY) -x $(COMPRESSOR_THREADS) $*
+	@[ -n "${CI}" ] && printf '::endgroup::\n' || true
 
 platformfs-all: $(ALL_PLATFORMFS)
 
 platformfs-all-print:
 	@echo $(ALL_PLATFORMFS) | sed "s: :\n:g"
 
-void-%-PLATFORMFS-$(DATECODE).tar.xz: $(SCRIPTS)
+.SECONDEXPANSION:
+void-%-PLATFORMFS-$(DATECODE).tar.xz: void-$$(shell ./lib.sh platform2arch %)-ROOTFS-$(DATECODE).tar.xz
+	@[ -n "${CI}" ] && printf "::group::\x1b[32mBuilding $@...\x1b[0m\n" || true
 	$(SUDO) ./mkplatformfs.sh $(XBPS_REPOSITORY) -x $(COMPRESSOR_THREADS) $* void-$(shell ./lib.sh platform2arch $*)-ROOTFS-$(DATECODE).tar.xz
+	@[ -n "${CI}" ] && printf '::endgroup::\n' || true
 
 images-all: platformfs-all images-all-sbc images-all-cloud
 
@@ -64,19 +87,25 @@ images-all-print:
 	@echo $(ALL_SBC_IMAGES) $(ALL_CLOUD_IMAGES) | sed "s: :\n:g"
 
 void-%-$(DATECODE).img.xz: void-%-PLATFORMFS-$(DATECODE).tar.xz
+	@[ -n "${CI}" ] && printf "::group::\x1b[32mBuilding $@...\x1b[0m\n" || true
 	$(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-$*-PLATFORMFS-$(DATECODE).tar.xz
+	@[ -n "${CI}" ] && printf '::endgroup::\n' || true
 
 # Some of the images MUST be compressed with gzip rather than xz, this
 # rule services those images.
 void-%-$(DATECODE).tar.gz: void-%-PLATFORMFS-$(DATECODE).tar.xz
+	@[ -n "${CI}" ] && printf "::group::\x1b[32mBuilding $@...\x1b[0m\n" || true
 	$(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-$*-PLATFORMFS-$(DATECODE).tar.xz
+	@[ -n "${CI}" ] && printf '::endgroup::\n' || true
 
 pxe-all: $(ALL_PXE_ARCHS)
 
 pxe-all-print:
 	@echo $(ALL_PXE_ARCHS) | sed "s: :\n:g"
 
-void-%-NETBOOT-$(DATECODE).tar.gz: $(SCRIPTS) void-%-ROOTFS-$(DATECODE).tar.xz
+void-%-NETBOOT-$(DATECODE).tar.gz: void-%-ROOTFS-$(DATECODE).tar.xz
+	@[ -n "${CI}" ] && printf "::group::\x1b[32mBuilding $@...\x1b[0m\n" || true
 	$(SUDO) ./mknet.sh void-$*-ROOTFS-$(DATECODE).tar.xz
+	@[ -n "${CI}" ] && printf '::endgroup::\n' || true
 
-.PHONY: all dist rootfs-all-print rootfs-all platformfs-all-print platformfs-all pxe-all-print pxe-all
+.PHONY: all checksum dist live-iso-all live-iso-all-print rootfs-all-print rootfs-all platformfs-all-print platformfs-all pxe-all-print pxe-all