From 38a634b03f187db4317b87ffd3ea53ce683bd3a8 Mon Sep 17 00:00:00 2001 From: John Serock <1468970+serock@users.noreply.github.com> Date: Sun, 10 Dec 2023 08:34:54 -0500 Subject: [PATCH 1/2] Update the supported values of the os and distribution parameters. --- doc/catalog-format-spec.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/catalog-format-spec.md b/doc/catalog-format-spec.md index 62b8b4ae8..c5cf29d6c 100644 --- a/doc/catalog-format-spec.md +++ b/doc/catalog-format-spec.md @@ -856,11 +856,13 @@ available.'case(toolchain)'.user = false ## Parameters - - `os`: name of the OS. Currently supported values are: `linux`, `macos` and - `windows`. + - `os`: name of the OS. Currently supported values are: `freebsd`, `linux`, + `macos`, `os-unknown`, and `windows`. - - `distribution`: name of the Linux distribution, or `none` if running on a - different OS. Currently supported values are: `debian`, `ubuntu`. + - `distribution`: name of the Linux distribution or name of the software + distribution platform if running on a different OS. Currently supported + values are: `arch`, `centos`, `debian`, `distro-unknown`, `fedora`, + `homebrew`, `macports`, `msys2`, `rhel`, `suse`, and `ubuntu`. - `toolchain`: takes `system` value in distributions with the system Ada compiler first in PATH (GNAT FSF in Debian/Ubuntu), `user` otherwise (GNAT From 677bfe50a3e73135b546aff750a7b6dc7846c5cc Mon Sep 17 00:00:00 2001 From: "Alejandro R. Mosteo" Date: Tue, 27 Feb 2024 12:17:59 +0100 Subject: [PATCH 2/2] Use new `distribution-unknown` --- doc/catalog-format-spec.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/catalog-format-spec.md b/doc/catalog-format-spec.md index 43299582b..0f6071afe 100644 --- a/doc/catalog-format-spec.md +++ b/doc/catalog-format-spec.md @@ -878,12 +878,13 @@ available.'case(toolchain)'.user = false ## Parameters - `os`: name of the OS. Currently supported values are: `freebsd`, `linux`, - `macos`, `os-unknown`, and `windows`. + `macos`, `windows`, and `os-unknown`. - `distribution`: name of the Linux distribution or name of the software distribution platform if running on a different OS. Currently supported - values are: `arch`, `centos`, `debian`, `distro-unknown`, `fedora`, - `homebrew`, `macports`, `msys2`, `rhel`, `suse`, and `ubuntu`. + values are: `arch`, `centos`, `debian`, `fedora`, + `homebrew`, `macports`, `msys2`, `rhel`, `suse`, `ubuntu`, and + `distribution-unknown`. - `toolchain`: takes `system` value in distributions with the system Ada compiler first in PATH (GNAT FSF in Debian/Ubuntu), `user` otherwise (GNAT