podvm-mkosi: fix Architecture cannot be used in Match

mkosi version in nix is 17.1, which doesn't support Architecture in [Match] As a workaround, use a flag files instead Signed-off-by: Lei Li <[email protected]> Signed-off-by: Lei Li <[email protected]>
confidential-containers · Mar 29, 2024 · d12a5be · d12a5be
1 parent a554e6d
commit d12a5be
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/src/cloud-api-adaptor/podvm-mkosi/Makefile b/src/cloud-api-adaptor/podvm-mkosi/Makefile
@@ -45,26 +45,31 @@ binaries:
 PHONY: image
 image:
 	@echo "Enabling production preset..."
-	rm -rf resources/buildDebugImage
+	rm -rf resources/build*Image
 	rm -rf ./build
 	@echo "Building image..."
 ifeq ($(ARCH),s390x)
+	touch resources/buildS390xImage
 	mkosi --profile production.conf
 	../hack/build-s390x-image.sh
 else
+	touch resources/buildBootableImage
 	nix develop ..#podvm-mkosi --command mkosi --environment=VARIANT_ID=production
 endif
 
 PHONY: image-debug
 image-debug:
 	@echo "Enabling debug preset..."
+	rm -rf resources/build*Image
 	touch resources/buildDebugImage
 	rm -rf ./build
 	@echo "Building debug image..."
 ifeq ($(ARCH),s390x)
+	touch resources/buildS390xImage
 	mkosi --profile debug.conf
 	../hack/build-s390x-image.sh
 else
+	touch resources/buildBootableImage
 	nix develop ..#podvm-mkosi --command mkosi --environment=VARIANT_ID=debug
 endif
 

diff --git a/src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/initrd/mkosi.conf.d/fedora-s390x.conf b/src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/initrd/mkosi.conf.d/fedora-s390x.conf
@@ -1,7 +1,11 @@
 [Match]
 Distribution=fedora
 
-Architecture=s390x
+# mkosi version in nix is 17.1,
+# which doesn't support Architecture in [Match]
+# As a workaround, use a flag file instead.
+#Architecture=s390x
+PathExists=../../resources/buildS390xImage
 
 [Content]
 Packages=kernel-core

diff --git a/src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/system/mkosi.conf.d/fedora-bootable.conf b/src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/system/mkosi.conf.d/fedora-bootable.conf
@@ -1,7 +1,11 @@
 [Match]
 Distribution=fedora
 
-Architecture=!s390x
+# mkosi version in nix is 17.1,
+# which doesn't support Architecture in [Match]
+# As a workaround, use a flag file instead.
+#Architecture=!s390x
+PathExists=../../resources/buildBootableImage
 
 [Content]
 Packages=systemd-boot
diff --git a/src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/system/mkosi.conf.d/fedora-s390x.conf b/src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/system/mkosi.conf.d/fedora-s390x.conf
@@ -1,7 +1,11 @@
 [Match]
 Distribution=fedora
 
-Architecture=s390x
+# mkosi version in nix is 17.1,
+# which doesn't support Architecture in [Match]
+# As a workaround, use a flag file instead.
+#Architecture=s390x
+PathExists=../../resources/buildS390xImage
 
 [Content]
 Bootable=no