From 3558d753da05bb277ef08978d1fe5613c215a767 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 12 Mar 2024 01:10:38 +0000 Subject: [PATCH 1/2] opam: add 'support' for wolfi This gets rid of red-herring warnings that opam doesn't know how to query system packages on wolfi, by quering things using apk just like it does for Alpine. This removes the warning from build logs. And this seems to be about it. Signed-off-by: Dimitri John Ledkov --- opam.yaml | 6 ++++- ...pam-Let-wolfi-be-treated-like-alpine.patch | 26 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 opam/0001-opam-Let-wolfi-be-treated-like-alpine.patch diff --git a/opam.yaml b/opam.yaml index c2a0d952886..e3cf3b33032 100644 --- a/opam.yaml +++ b/opam.yaml @@ -1,7 +1,7 @@ package: name: opam version: 2.1.5 - epoch: 0 + epoch: 1 description: "opam is a source-based package manager. It supports multiple simultaneous compiler installations, flexible package constraints, and a Git-friendly development workflow." copyright: - license: LGPL-2.1-or-later-WITH-linking-exception @@ -27,6 +27,10 @@ pipeline: tag: ${{package.version}} expected-commit: 93f47ec3140f6299182254fbe7eeae68f9ca7abd + - uses: patch + with: + patches: 0001-opam-Let-wolfi-be-treated-like-alpine.patch + - runs: | ./configure \ --build=$CBUILD \ diff --git a/opam/0001-opam-Let-wolfi-be-treated-like-alpine.patch b/opam/0001-opam-Let-wolfi-be-treated-like-alpine.patch new file mode 100644 index 00000000000..9d3b9f1f34c --- /dev/null +++ b/opam/0001-opam-Let-wolfi-be-treated-like-alpine.patch @@ -0,0 +1,26 @@ +From 5fd51f6e361fd03b06e2e5dca8bb0a18c5495d92 Mon Sep 17 00:00:00 2001 +From: Dimitri John Ledkov +Date: Mon, 11 Mar 2024 23:54:58 +0000 +Subject: [PATCH] opam: Let wolfi be treated like alpine + +Signed-off-by: Dimitri John Ledkov +--- + src/state/opamSysInteract.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/state/opamSysInteract.ml b/src/state/opamSysInteract.ml +index 7b6374c71..1110cb9ff 100644 +--- a/src/state/opamSysInteract.ml ++++ b/src/state/opamSysInteract.ml +@@ -105,7 +105,7 @@ let family = + "External dependency unusable, OS family not detected." + | Some family -> + match family with +- | "alpine" -> Alpine ++ | "alpine" | "wolfi" -> Alpine + | "amzn" | "centos" | "fedora" | "mageia" | "oraclelinux" | "ol" + | "rhel" -> Centos + | "archlinux" | "arch" -> Arch +-- +2.43.0 + From d4e7408c976af320654edec02cffb6cf50be2c21 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 12 Mar 2024 01:27:48 +0000 Subject: [PATCH 2/2] Add patch provenance Signed-off-by: Dimitri John Ledkov --- opam/0001-opam-Let-wolfi-be-treated-like-alpine.patch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opam/0001-opam-Let-wolfi-be-treated-like-alpine.patch b/opam/0001-opam-Let-wolfi-be-treated-like-alpine.patch index 9d3b9f1f34c..e47eca10888 100644 --- a/opam/0001-opam-Let-wolfi-be-treated-like-alpine.patch +++ b/opam/0001-opam-Let-wolfi-be-treated-like-alpine.patch @@ -5,6 +5,9 @@ Subject: [PATCH] opam: Let wolfi be treated like alpine Signed-off-by: Dimitri John Ledkov --- + + Backport from https://github.com/ocaml/opam/pull/5878/files + src/state/opamSysInteract.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)