Control PXE tarball builds with Makefile

Michael Aldridge committed 9 years ago

Commit fc805231 parent 89e3aff4 files · +17 −6Browse files

Unified · Split

4 files

@@ -10,15 +10,19 @@ T_ARCHS=i686 x86_64{,-musl} armv{6,7}l{,-musl} aarch64{,-musl} · 9 unmodified lines
10	10	T_SBC_IMGS=rpi{,2,3}{,-musl} beaglebone{,-musl} cubieboard2{,-musl} odroid-c2{,-musl} usbarmory{,-musl}
11	11	T_CLOUD_IMGS=GCP{,-musl}
12	12
	13	+T_PXE_ARCHS=x86_64{,-musl}
	14	+
13	15	ARCHS=$(shell echo $(T_ARCHS))
14	16	PLATFORMS=$(shell echo $(T_PLATFORMS))
15	17	SBC_IMGS=$(shell echo $(T_SBC_IMGS))
16	18	CLOUD_IMGS=$(shell echo $(T_CLOUD_IMGS))
	19	+PXE_ARCHS=$(shell echo $(T_PXE_ARCHS))
17	20
18	21	ALL_ROOTFS=$(foreach arch,$(ARCHS),void-$(arch)-ROOTFS-$(DATE).tar.xz)
19	22	ALL_PLATFORMFS=$(foreach platform,$(PLATFORMS),void-$(platform)-PLATFORMFS-$(DATE).tar.xz)
20	23	ALL_SBC_IMAGES=$(foreach platform,$(SBC_IMGS),void-$(platform)-$(DATE).img.xz)
21	24	ALL_CLOUD_IMAGES=$(foreach cloud,$(CLOUD_IMGS),void-$(cloud)-$(DATE).tar.gz)
	25	+ALL_PXE_ARCHS=$(foreach arch,$(PXE_ARCHS),void-$(arch)-NETBOOT-$(DATE).tar.gz)
22	26
23	27	SUDO := sudo
24	28
@@ -75,6 +79,12 @@ void-GCP-$(DATE).tar.gz: · 50 unmodified lines
75	79	void-GCP-musl-$(DATE).tar.gz:
76	80	$(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-GCP-musl-PLATFORMFS-$(DATE).tar.xz
77	81
	82	+pxe-all: $(ALL_PXE_ARCHS)
	83	+
	84	+pxe-all-print:
	85	+ @echo $(ALL_PXE_ARCHS)
78	86
	87	+void-%-NETBOOT-$(DATE).tar.gz: $(SCRIPTS)
	88	+ $(SUDO) ./mknet.sh void-$*-ROOTFS-$(DATE).tar.xz
79	89
80		−.PHONY: clean dist rootfs-all-print platformfs-all-print
	90	+.PHONY: clean dist rootfs-all-print platformfs-all-print pxe-all-print

@@ -8,7 +8,7 @@ dialog --colors --keep-tite --no-shadow --no-mouse \ · 7 unmodified lines
8	8	"Shell" "Run dash" \
9	9	2>/tmp/netmenu.action
10	10
11		−if ! $? ; then
	11	+if [ ! $? ] ; then
12	12	reboot -f
13	13	fi
14	14

@@ -211,10 +211,10 @@ sed -i -e "s\|@@SPLASHIMAGE@@\|$(basename "${SPLASH_IMAGE}")\|" \ · 210 unmodified lines
211	211	"$PXELINUX_DIR/default"
212	212
213	213	# Default output file format
214		−OUTPUT_FILE="void-netboot-${XBPS_TARGET_ARCH}-${KERNELVERSION}-$(date +%Y%m%d)"
215		−info_msg "Compressing results to $OUTPUT_FILE.tar.gz"
	214	+OUTPUT_FILE="void-${XBPS_TARGET_ARCH}-NETBOOT-$(date +%Y%m%d).tar.gz"
	215	+info_msg "Compressing results to $OUTPUT_FILE"
216	216	cd "$BOOT_DIR" \|\| die "Could not enter image dir"
217		−tar -zcvf "$CURDIR/$OUTPUT_FILE.tar.gz" .
	217	+tar -zcvf "$CURDIR/$OUTPUT_FILE" .
218	218	cd "$CURDIR" \|\| die "Could not return to working directory"
219	219
220	220	# As a final cleanup step, remove the ROOTFS and the expanded BOOT_DIR

Keyboard shortcuts