1 files changed, 42 insertions, 18 deletions

diff --git a/internal/rosa/package/cmake/package.az b/internal/rosa/package/cmake/package.az
index 1e6ea8b3..38d2c286 100644
--- a/internal/rosa/package/cmake/package.az
+++ b/internal/rosa/package/cmake/package.az
@@ -1,42 +1,66 @@
-package cmake {
-	description = "cross-platform, open-source build system";
-	website = "https://cmake.org";
-	anitya = 306;
+package cmake-source {
+	description = "CMake source tree";
+	exclude = true;
 
-	version# = "4.4.3";
-	source = remoteGitHubRelease {
+	version# = "4.4.4";
+	output = remoteGitHubRelease {
 		suffix = "Kitware/CMake";
 		tag = "v"+version;
 		name = "cmake-"+version+".tar.gz";
-		checksum = "69yrNbgUPZXY0phavZEMPRgBu_6858LHzLoyHk1aeTuXf8RW5Ec37lr2OBaGZ5PY";
+		checksum = "I7vJROVzty0xtoWvDQzR5JpnEl-gO-1kXd-qIO2lWgj65Hgyd4kA08mM1wk5l8z3";
 		compress = gzip;
 	};
-	patches = [ "disable-broken-tests-musl.patch" ];
+	patches = [
+		"disable-broken-tests-musl.patch",
+		"disable-flaky-tests.patch",
+	];
+}
 
-	// test suite expects writable source tree
-	writable = true;
+package cmake-early {
+	description = "minimal CMake bootstrap build";
+	exclude = true;
+	source = cmake-source;
 
 	// expected to be writable in the copy made during bootstrap
+	writable = true;
 	chmod = true;
 
 	exec = make {
 		defaults = false;
 
-		configureName = "/usr/src/cmake/bootstrap";
+		configureName = "/usr/src/cmake-early/bootstrap";
 		configure = {
 			"prefix": "/system";
 			"parallel": jobsE;
 			"--";
 			"-DCMAKE_USE_OPENSSL": "OFF";
-			"-DCMake_TEST_NO_NETWORK": "ON";
-			"-DCMake_TEST_BOOTSTRAP": "OFF";
 		};
 
-		check = [
-			"CTEST_OUTPUT_ON_FAILURE=1",
-			"CTEST_PARALLEL_LEVEL=128",
-			"test",
-		];
+		// tested in full build
+		check = nil;
+	};
+
+	inputs = [ kernel-headers ];
+}
+
+package cmake {
+	description = "cross-platform, open-source build system";
+	website = "https://cmake.org";
+	anitya = 306;
+	source = cmake-source;
+
+	// test suite expects writable source tree
+	writable = true;
+	chmod = true;
+
+	exec = cmake {
+		early = true;
+		make = true;
+		cache = {
+			"CMAKE_USE_OPENSSL": "OFF";
+			"CMake_TEST_NO_NETWORK": "ON";
+			"CMake_TEST_BOOTSTRAP": "OFF";
+		};
 	};
 
 	inputs = [ kernel-headers ];