mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
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>
This commit is contained in:
Andrew Cooper committed
1 parent
e58d8aa171
commit
fdcc559661
8 files changed
+8
-8
No files matched your search
@@ -46,7 +46,7 @@ RUN <<EOF
|
||||
# Golang bindings
|
||||
golang-go
|
||||
# Ocaml bindings/oxenstored
|
||||
ocaml-nox
|
||||
ocaml
|
||||
ocaml-findlib
|
||||
|
||||
# for test phase, qemu-* jobs
|
||||
|
||||
@@ -38,7 +38,7 @@ RUN <<EOF
|
||||
python3-dev
|
||||
python3-setuptools
|
||||
# Ocaml bindings/oxenstored
|
||||
ocaml-nox
|
||||
ocaml
|
||||
ocaml-findlib
|
||||
)
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ RUN <<EOF
|
||||
# Golang bindings
|
||||
golang-go
|
||||
# Ocaml bindings/oxenstored
|
||||
ocaml-nox
|
||||
ocaml
|
||||
ocaml-findlib
|
||||
|
||||
# for test phase, qemu-* jobs
|
||||
|
||||
@@ -47,7 +47,7 @@ RUN <<EOF
|
||||
# Golang bindings
|
||||
golang-go
|
||||
# Ocaml bindings/oxenstored
|
||||
ocaml-nox
|
||||
ocaml
|
||||
ocaml-findlib
|
||||
|
||||
# for test phase, qemu-* jobs
|
||||
|
||||
@@ -38,7 +38,7 @@ RUN <<EOF
|
||||
python3-dev
|
||||
python3-setuptools
|
||||
# Ocaml bindings/oxenstored
|
||||
ocaml-nox
|
||||
ocaml
|
||||
ocaml-findlib
|
||||
)
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ RUN <<EOF
|
||||
# Golang bindings
|
||||
golang-go
|
||||
# Ocaml bindings/oxenstored
|
||||
ocaml-nox
|
||||
ocaml
|
||||
ocaml-findlib
|
||||
|
||||
# for test phase, qemu-* jobs
|
||||
|
||||
@@ -51,7 +51,7 @@ RUN <<EOF
|
||||
python3-dev
|
||||
python3-setuptools
|
||||
# Ocaml bindings/oxenstored
|
||||
ocaml-nox
|
||||
ocaml
|
||||
ocaml-findlib
|
||||
|
||||
# Stubdom download/extract
|
||||
|
||||
@@ -51,7 +51,7 @@ RUN <<EOF
|
||||
python3-dev
|
||||
python3-setuptools
|
||||
# Ocaml bindings/oxenstored
|
||||
ocaml-nox
|
||||
ocaml
|
||||
ocaml-findlib
|
||||
|
||||
# Stubdom download/extract
|
||||
|
||||