From fdcc559661cf41390fe2b15b4ad09bd6518fa5f3 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Fri, 5 Jun 2026 14:19:57 +0100
Subject: [PATCH] CI: Swap ocaml-nox for ocaml in newer Debian/Ubuntu

Ocaml 4.08 and earlier had the compiler package depend on graphics, and
therefore on X.  Ocaml 4.09 and later dropped this dependency.

Debian and Ubuntu versions with Ocaml 4.08 and earlier (which are Debian
Bullseye/11, and Ubuntu Focal/20.04 and earlier) had ocaml-nox packages with
this dependency stripped, which we use to keep the size of the containers
down.

In newer versions of Debian and Ubuntu, ocaml-nox is just a transitional
package referring back to ocaml.  Ubuntu Resolute/26.04 has finally removed
this transitional package.  For all versions where ocaml-nox is just a
transitional package, swap to the ocaml package.

No functional change.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Denis Mukhin <dmukhin@ford.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
Release-Acked-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
 automation/build/debian/12-arm64v8.dockerfile   | 2 +-
 automation/build/debian/12-x86_32.dockerfile    | 2 +-
 automation/build/debian/12-x86_64.dockerfile    | 2 +-
 automation/build/debian/13-arm64v8.dockerfile   | 2 +-
 automation/build/debian/13-x86_32.dockerfile    | 2 +-
 automation/build/debian/13-x86_64.dockerfile    | 2 +-
 automation/build/ubuntu/22.04-x86_64.dockerfile | 2 +-
 automation/build/ubuntu/24.04-x86_64.dockerfile | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/automation/build/debian/12-arm64v8.dockerfile b/automation/build/debian/12-arm64v8.dockerfile
index c0e08a010f..5cc4de822c 100644
--- a/automation/build/debian/12-arm64v8.dockerfile
+++ b/automation/build/debian/12-arm64v8.dockerfile
@@ -46,7 +46,7 @@ RUN <<EOF
         # Golang bindings
         golang-go
         # Ocaml bindings/oxenstored
-        ocaml-nox
+        ocaml
         ocaml-findlib
 
         # for test phase, qemu-* jobs
diff --git a/automation/build/debian/12-x86_32.dockerfile b/automation/build/debian/12-x86_32.dockerfile
index 447152d7e5..3457eca782 100644
--- a/automation/build/debian/12-x86_32.dockerfile
+++ b/automation/build/debian/12-x86_32.dockerfile
@@ -38,7 +38,7 @@ RUN <<EOF
         python3-dev
         python3-setuptools
         # Ocaml bindings/oxenstored
-        ocaml-nox
+        ocaml
         ocaml-findlib
     )
 
diff --git a/automation/build/debian/12-x86_64.dockerfile b/automation/build/debian/12-x86_64.dockerfile
index 4e533ee879..afb16f3711 100644
--- a/automation/build/debian/12-x86_64.dockerfile
+++ b/automation/build/debian/12-x86_64.dockerfile
@@ -50,7 +50,7 @@ RUN <<EOF
         # Golang bindings
         golang-go
         # Ocaml bindings/oxenstored
-        ocaml-nox
+        ocaml
         ocaml-findlib
 
         # for test phase, qemu-* jobs
diff --git a/automation/build/debian/13-arm64v8.dockerfile b/automation/build/debian/13-arm64v8.dockerfile
index ee9bb841eb..1d9e9d63ad 100644
--- a/automation/build/debian/13-arm64v8.dockerfile
+++ b/automation/build/debian/13-arm64v8.dockerfile
@@ -47,7 +47,7 @@ RUN <<EOF
         # Golang bindings
         golang-go
         # Ocaml bindings/oxenstored
-        ocaml-nox
+        ocaml
         ocaml-findlib
 
         # for test phase, qemu-* jobs
diff --git a/automation/build/debian/13-x86_32.dockerfile b/automation/build/debian/13-x86_32.dockerfile
index 464b4fc55e..204d3c1e6d 100644
--- a/automation/build/debian/13-x86_32.dockerfile
+++ b/automation/build/debian/13-x86_32.dockerfile
@@ -38,7 +38,7 @@ RUN <<EOF
         python3-dev
         python3-setuptools
         # Ocaml bindings/oxenstored
-        ocaml-nox
+        ocaml
         ocaml-findlib
     )
 
diff --git a/automation/build/debian/13-x86_64.dockerfile b/automation/build/debian/13-x86_64.dockerfile
index e0a7225952..784299d52d 100644
--- a/automation/build/debian/13-x86_64.dockerfile
+++ b/automation/build/debian/13-x86_64.dockerfile
@@ -51,7 +51,7 @@ RUN <<EOF
         # Golang bindings
         golang-go
         # Ocaml bindings/oxenstored
-        ocaml-nox
+        ocaml
         ocaml-findlib
 
         # for test phase, qemu-* jobs
diff --git a/automation/build/ubuntu/22.04-x86_64.dockerfile b/automation/build/ubuntu/22.04-x86_64.dockerfile
index 6ae7f4faa8..47aadc0548 100644
--- a/automation/build/ubuntu/22.04-x86_64.dockerfile
+++ b/automation/build/ubuntu/22.04-x86_64.dockerfile
@@ -51,7 +51,7 @@ RUN <<EOF
         python3-dev
         python3-setuptools
         # Ocaml bindings/oxenstored
-        ocaml-nox
+        ocaml
         ocaml-findlib
 
         # Stubdom download/extract
diff --git a/automation/build/ubuntu/24.04-x86_64.dockerfile b/automation/build/ubuntu/24.04-x86_64.dockerfile
index 84777d188c..a41632d5cf 100644
--- a/automation/build/ubuntu/24.04-x86_64.dockerfile
+++ b/automation/build/ubuntu/24.04-x86_64.dockerfile
@@ -51,7 +51,7 @@ RUN <<EOF
         python3-dev
         python3-setuptools
         # Ocaml bindings/oxenstored
-        ocaml-nox
+        ocaml
         ocaml-findlib
 
         # Stubdom download/extract