Merge pull request #4728 from yeazelm/erofs4all

yeazelm · web-flow · commit a32e18f0ee31 · 2026-01-06T10:46:23.000-08:00
Move remaining variants to EROFS
diff --git a/variants/aws-ecs-2-fips/Cargo.toml b/variants/aws-ecs-2-fips/Cargo.toml
@@ -11,6 +11,7 @@ exclude = ["README.md"]
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 
diff --git a/variants/aws-ecs-2-nvidia-fips/Cargo.toml b/variants/aws-ecs-2-nvidia-fips/Cargo.toml
@@ -9,6 +9,7 @@ build = "../build.rs"
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 
diff --git a/variants/aws-ecs-2-nvidia/Cargo.toml b/variants/aws-ecs-2-nvidia/Cargo.toml
@@ -9,6 +9,7 @@ build = "../build.rs"
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 
 [package.metadata.build-variant.image-layout]
diff --git a/variants/aws-ecs-2/Cargo.toml b/variants/aws-ecs-2/Cargo.toml
@@ -11,6 +11,7 @@ exclude = ["README.md"]
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 
 [package.metadata.build-variant]
diff --git a/variants/aws-k8s-1.29-fips/Cargo.toml b/variants/aws-k8s-1.29-fips/Cargo.toml
@@ -13,6 +13,7 @@ exclude = ["README.md"]
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 
diff --git a/variants/aws-k8s-1.29-nvidia-fips/Cargo.toml b/variants/aws-k8s-1.29-nvidia-fips/Cargo.toml
@@ -16,6 +16,7 @@ os-image-size-gib = 4
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 
diff --git a/variants/aws-k8s-1.29-nvidia/Cargo.toml b/variants/aws-k8s-1.29-nvidia/Cargo.toml
@@ -16,6 +16,7 @@ os-image-size-gib = 4
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 
 [package.metadata.build-variant]
diff --git a/variants/aws-k8s-1.29/Cargo.toml b/variants/aws-k8s-1.29/Cargo.toml
@@ -13,6 +13,7 @@ exclude = ["README.md"]
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 
 [package.metadata.build-variant]
diff --git a/variants/aws-k8s-1.30-fips/Cargo.toml b/variants/aws-k8s-1.30-fips/Cargo.toml
@@ -13,6 +13,7 @@ exclude = ["README.md"]
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 
diff --git a/variants/aws-k8s-1.30-nvidia-fips/Cargo.toml b/variants/aws-k8s-1.30-nvidia-fips/Cargo.toml
@@ -16,6 +16,7 @@ os-image-size-gib = 4
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 
diff --git a/variants/aws-k8s-1.30-nvidia/Cargo.toml b/variants/aws-k8s-1.30-nvidia/Cargo.toml
@@ -16,6 +16,7 @@ os-image-size-gib = 4
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 
 [package.metadata.build-variant]
diff --git a/variants/aws-k8s-1.30/Cargo.toml b/variants/aws-k8s-1.30/Cargo.toml
@@ -13,6 +13,7 @@ exclude = ["README.md"]
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 
 [package.metadata.build-variant]
diff --git a/variants/aws-k8s-1.31-fips/Cargo.toml b/variants/aws-k8s-1.31-fips/Cargo.toml
@@ -13,6 +13,7 @@ exclude = ["README.md"]
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 
diff --git a/variants/aws-k8s-1.31-nvidia-fips/Cargo.toml b/variants/aws-k8s-1.31-nvidia-fips/Cargo.toml
@@ -16,6 +16,7 @@ os-image-size-gib = 4
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 
diff --git a/variants/aws-k8s-1.31-nvidia/Cargo.toml b/variants/aws-k8s-1.31-nvidia/Cargo.toml
@@ -16,6 +16,7 @@ os-image-size-gib = 4
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 
 [package.metadata.build-variant]
diff --git a/variants/aws-k8s-1.31/Cargo.toml b/variants/aws-k8s-1.31/Cargo.toml
@@ -13,6 +13,7 @@ exclude = ["README.md"]
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 
 [package.metadata.build-variant]
diff --git a/variants/aws-k8s-1.32-fips/Cargo.toml b/variants/aws-k8s-1.32-fips/Cargo.toml
@@ -13,6 +13,7 @@ exclude = ["README.md"]
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 
diff --git a/variants/aws-k8s-1.32-nvidia-fips/Cargo.toml b/variants/aws-k8s-1.32-nvidia-fips/Cargo.toml
@@ -16,6 +16,7 @@ os-image-size-gib = 4
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 
diff --git a/variants/aws-k8s-1.32-nvidia/Cargo.toml b/variants/aws-k8s-1.32-nvidia/Cargo.toml
@@ -16,6 +16,7 @@ os-image-size-gib = 4
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 
 [package.metadata.build-variant]
diff --git a/variants/aws-k8s-1.32/Cargo.toml b/variants/aws-k8s-1.32/Cargo.toml
@@ -13,6 +13,7 @@ exclude = ["README.md"]
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 
 [package.metadata.build-variant]
diff --git a/variants/aws-k8s-1.33-fips/Cargo.toml b/variants/aws-k8s-1.33-fips/Cargo.toml
@@ -13,6 +13,7 @@ exclude = ["README.md"]
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 external-kmod-development = false
diff --git a/variants/metal-dev/Cargo.toml b/variants/metal-dev/Cargo.toml
@@ -13,6 +13,7 @@ partition-plan = "unified"
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
 xfs-data-partition = true
+erofs-root-partition = true
 uefi-secure-boot = true
 systemd-networkd = true
 
diff --git a/variants/vmware-k8s-1.29-fips/Cargo.toml b/variants/vmware-k8s-1.29-fips/Cargo.toml
@@ -16,6 +16,7 @@ partition-plan = "unified"
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 
diff --git a/variants/vmware-k8s-1.29/Cargo.toml b/variants/vmware-k8s-1.29/Cargo.toml
@@ -16,6 +16,7 @@ partition-plan = "unified"
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 
 [package.metadata.build-variant]
diff --git a/variants/vmware-k8s-1.30-fips/Cargo.toml b/variants/vmware-k8s-1.30-fips/Cargo.toml
@@ -16,6 +16,7 @@ partition-plan = "unified"
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 
diff --git a/variants/vmware-k8s-1.30/Cargo.toml b/variants/vmware-k8s-1.30/Cargo.toml
@@ -16,6 +16,7 @@ partition-plan = "unified"
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 
 [package.metadata.build-variant]
diff --git a/variants/vmware-k8s-1.31-fips/Cargo.toml b/variants/vmware-k8s-1.31-fips/Cargo.toml
@@ -16,6 +16,7 @@ partition-plan = "unified"
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 
diff --git a/variants/vmware-k8s-1.31/Cargo.toml b/variants/vmware-k8s-1.31/Cargo.toml
@@ -16,6 +16,7 @@ partition-plan = "unified"
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 
 [package.metadata.build-variant]
diff --git a/variants/vmware-k8s-1.32-fips/Cargo.toml b/variants/vmware-k8s-1.32-fips/Cargo.toml
@@ -16,6 +16,7 @@ partition-plan = "unified"
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 
diff --git a/variants/vmware-k8s-1.32/Cargo.toml b/variants/vmware-k8s-1.32/Cargo.toml
@@ -16,6 +16,7 @@ partition-plan = "unified"
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 
 [package.metadata.build-variant]
diff --git a/variants/vmware-k8s-1.33-fips/Cargo.toml b/variants/vmware-k8s-1.33-fips/Cargo.toml
@@ -16,6 +16,7 @@ partition-plan = "unified"
 grub-set-private-var = true
 uefi-secure-boot = true
 xfs-data-partition = true
+erofs-root-partition = true
 systemd-networkd = true
 fips = true
 external-kmod-development = false
