From e833e66ac9e56c72dc4665ff4bf2cb4662664438 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 11 Oct 2022 09:12:33 -0600
Subject: [PATCH] Move CI to its own makefile

---
 Makefile | 36 ++----------------------------------
 mk/ci.mk | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 34 deletions(-)
 create mode 100644 mk/ci.mk

diff --git a/Makefile b/Makefile
index b746a24..c647f04 100644
--- a/Makefile
+++ b/Makefile
@@ -51,40 +51,8 @@ include mk/qemu.mk
 include mk/bochs.mk
 include mk/virtualbox.mk
 
-# CI image target
-IMG_TAG?=$(shell git describe --tags)
-ci-img: FORCE
-	$(MAKE) REPO_BINARY=1 \
-		build/harddrive.img \
-		build/livedisk.iso
-	rm -rf build/img
-	mkdir -p build/img
-	cp "build/harddrive.img" "build/img/redox_$(IMG_TAG)_harddrive.img"
-	cp "build/livedisk.iso" "build/img/redox_$(IMG_TAG)_livedisk.iso"
-	cd build/img && sha256sum -b * > SHA256SUM
-
-# CI packaging target
-ci-pkg: prefix FORCE
-	$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
-	$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
-	export PATH="$(PREFIX_PATH):$$PATH" && \
-	PACKAGES="$$($(INSTALLER) --list-packages -c ci.toml)" && \
-	cd cookbook && \
-	./fetch.sh "$${PACKAGES}" && \
-	./repo.sh "$${PACKAGES}"
-
-# CI toolchain
-ci-toolchain: FORCE
-	$(MAKE) PREFIX_BINARY=0 \
-		"prefix/$(TARGET)/gcc-install.tar.gz" \
-		"prefix/$(TARGET)/relibc-install.tar.gz" \
-		"prefix/$(TARGET)/rust-install.tar.gz"
-	rm -rf "build/toolchain/$(TARGET)"
-	mkdir -p "build/toolchain/$(TARGET)"
-	cp "prefix/$(TARGET)/gcc-install.tar.gz" "build/toolchain/$(TARGET)/gcc-install.tar.gz"
-	cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(TARGET)/relibc-install.tar.gz"
-	cp "prefix/$(TARGET)/rust-install.tar.gz" "build/toolchain/$(TARGET)/rust-install.tar.gz"
-	cd "build/toolchain/$(TARGET)" && sha256sum -b * > SHA256SUM
+# CI
+include mk/ci.mk
 
 env: prefix FORCE
 	export PATH="$(PREFIX_PATH):$$PATH" && \
diff --git a/mk/ci.mk b/mk/ci.mk
new file mode 100644
index 0000000..8b45ec7
--- /dev/null
+++ b/mk/ci.mk
@@ -0,0 +1,35 @@
+IMG_TAG?=$(shell git describe --tags)
+
+# CI image target
+ci-img: FORCE
+	$(MAKE) REPO_BINARY=1 \
+		build/harddrive.img \
+		build/livedisk.iso
+	rm -rf build/img
+	mkdir -p build/img
+	cp "build/harddrive.img" "build/img/redox_$(IMG_TAG)_harddrive.img"
+	cp "build/livedisk.iso" "build/img/redox_$(IMG_TAG)_livedisk.iso"
+	cd build/img && sha256sum -b * > SHA256SUM
+
+# CI packaging target
+ci-pkg: prefix FORCE
+	$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
+	$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
+	export PATH="$(PREFIX_PATH):$$PATH" && \
+	PACKAGES="$$($(INSTALLER) --list-packages -c ci.toml)" && \
+	cd cookbook && \
+	./fetch.sh "$${PACKAGES}" && \
+	./repo.sh "$${PACKAGES}"
+
+# CI toolchain
+ci-toolchain: FORCE
+	$(MAKE) PREFIX_BINARY=0 \
+		"prefix/$(TARGET)/gcc-install.tar.gz" \
+		"prefix/$(TARGET)/relibc-install.tar.gz" \
+		"prefix/$(TARGET)/rust-install.tar.gz"
+	rm -rf "build/toolchain/$(TARGET)"
+	mkdir -p "build/toolchain/$(TARGET)"
+	cp "prefix/$(TARGET)/gcc-install.tar.gz" "build/toolchain/$(TARGET)/gcc-install.tar.gz"
+	cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(TARGET)/relibc-install.tar.gz"
+	cp "prefix/$(TARGET)/rust-install.tar.gz" "build/toolchain/$(TARGET)/rust-install.tar.gz"
+	cd "build/toolchain/$(TARGET)" && sha256sum -b * > SHA256SUM