Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Depexts: Add support for NetBSD, DragonFlyBSD (+ fix OpenBSD, FreeBSD and Gentoo) #4396

Merged
merged 8 commits into from
Oct 21, 2020
Merged

Depexts: Add support for NetBSD, DragonFlyBSD (+ fix OpenBSD, FreeBSD and Gentoo) #4396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
623f124
FreeBSD: Allow to use package origins
kit-ty-kate Oct 18, 2020
bc164e1
Add support for DragonflyBSD
kit-ty-kate Oct 18, 2020
1ac3672
Add support for NetBSD
kit-ty-kate Oct 18, 2020
11c153b
Allow package paths along with package names on Gentoo
kit-ty-kate Oct 18, 2020
409651e
Order distributions in alphabetical order
kit-ty-kate Oct 20, 2020
1805396
Use OCaml 4.02 compatible function
kit-ty-kate Oct 20, 2020
414e8aa
Update the changelog
kit-ty-kate Oct 20, 2020
3ee922d
Order distributions alphabetically
rjbou Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ New option/command/subcommand are prefixed with ◈.
*

## External dependencies
*
* Add support for NetBSD and DragonFlyBSD [#4396 @kit-ty-kate]
* Fix OpenBSD, FreeBSD and Gentoo: Allow short names and full name paths for ports-based systems [#4396 @kit-ty-kate]

## Sandbox
*
Expand Down
62 changes: 46 additions & 16 deletions src/state/opamSysInteract.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ let run_command_exit_code ?vars ?allow_stdin ?verbose cmd args =
in
code

(* Please keep this alphabetically ordered, in the type definition, and in
below pattern matching *)
type families =
| Alpine
| Arch
Expand All @@ -90,6 +92,7 @@ type families =
| Gentoo
| Homebrew
| Macports
| Netbsd
| Openbsd
| Suse

Expand All @@ -106,10 +109,15 @@ let family =
| "amzn" | "centos" | "fedora" | "mageia" | "oraclelinux" | "ol"
| "rhel" -> Centos
| "archlinux" | "arch" -> Arch
| "bsd" when OpamSysPoll.os_distribution () = Some "freebsd" ->
Freebsd
| "bsd" when OpamSysPoll.os_distribution () = Some "openbsd" ->
Openbsd
| "bsd" ->
begin match OpamSysPoll.os_distribution () with
| Some ("freebsd" | "dragonfly") -> Freebsd
| Some "netbsd" -> Netbsd
| Some "openbsd" -> Openbsd
| _ ->
Printf.ksprintf failwith
"External dependency handling not supported for OS family 'bsd'."
end
| "debian" -> Debian
| "gentoo" -> Gentoo
| "homebrew" -> Homebrew
Expand Down Expand Up @@ -171,6 +179,18 @@ let packages_status packages =
with Not_found -> inst, avail)
OpamSysPkg.Set.(empty, empty)
in
let package_set_of_pkgpath l =
List.fold_left (fun set pkg ->
let short_name =
match String.rindex pkg '/' with
| exception Not_found -> pkg
| idx -> String.sub pkg idx (String.length pkg - idx)
in
set
|> OpamSysPkg.Set.add (OpamSysPkg.of_string pkg)
|> OpamSysPkg.Set.add (OpamSysPkg.of_string short_name)
) OpamSysPkg.Set.empty l
in
match family () with
| Alpine ->
let re_installed = Re.(compile (seq [str "[installed]"; eol])) in
Expand Down Expand Up @@ -318,7 +338,7 @@ let packages_status packages =
compute_sets sys_installed ~sys_available
| Freebsd ->
let sys_installed =
run_query_command "pkg" ["query"; "%n"]
run_query_command "pkg" ["query"; "%n\n%o"]
|> List.map OpamSysPkg.of_string
|> OpamSysPkg.Set.of_list
in
Expand All @@ -335,14 +355,18 @@ let packages_status packages =
eol ])
in
List.fold_left (fun inst dir ->
let pkg =
OpamFilename.basename_dir dir
|> OpamFilename.Base.to_string
in
try Re.(Group.get (exec re_pkg pkg) 1) +++ inst
with Not_found -> inst)
OpamSysPkg.Set.empty
(OpamFilename.rec_dirs (OpamFilename.Dir.of_string "/var/db/pkg"))
List.fold_left (fun inst pkg ->
let to_string d =
OpamFilename.basename_dir d
|> OpamFilename.Base.to_string
in
let pkg = Filename.concat (to_string dir) (to_string pkg) in
try Re.(Group.get (exec re_pkg pkg) 1) :: inst
with Not_found -> inst
) inst (OpamFilename.dirs dir))
[]
(OpamFilename.dirs (OpamFilename.Dir.of_string "/var/db/pkg"))
|> package_set_of_pkgpath
in
compute_sets sys_installed
| Homebrew ->
Expand Down Expand Up @@ -403,11 +427,16 @@ let packages_status packages =
|> with_regexp_sgl re_pkg
in
compute_sets sys_installed ~sys_available
| Netbsd ->
let sys_installed =
run_query_command "pkg_info" ["-Q"; "PKGPATH"; "-a"]
|> package_set_of_pkgpath
in
compute_sets sys_installed
| Openbsd ->
let sys_installed =
run_query_command "pkg_info" ["-mqP"]
|> List.map OpamSysPkg.of_string
|> OpamSysPkg.Set.of_list
|> package_set_of_pkgpath
in
compute_sets sys_installed
| Suse ->
Expand Down Expand Up @@ -476,6 +505,7 @@ let install_packages_commands_t sys_packages =
| Macports ->
["port", "install"::packages], (* NOTE: Does not have any interactive mode *)
None
| Netbsd -> ["pkgin", yes ["-y"] ("install" :: packages)], None
| Openbsd -> ["pkg_add", yes ~no:["-i"] ["-I"] packages], None
| Suse -> ["zypper", yes ["--non-interactive"] ("install"::packages)], None

Expand Down Expand Up @@ -527,7 +557,7 @@ let update () =
| Homebrew -> Some ("brew", ["update"])
| Macports -> Some ("port", ["sync"])
| Suse -> Some ("zypper", ["--non-interactive"; "update"])
| Freebsd | Openbsd ->
| Freebsd | Netbsd | Openbsd ->
None
in
match cmd with
Expand Down