Skip to content

Add FreeBSD support #191

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

Closed
kit-ty-kate wants to merge 1 commit into from
Closed

Add FreeBSD support #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/worker.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ module Obuilder_config = struct
| None -> None
| Some store -> Some (Cluster_worker.Obuilder_config.v sandbox_config store)
in
Term.(const make $ Obuilder.Runc_sandbox.cmdliner $ store)
Term.(const make $ Obuilder.Sandbox.cmdliner $ store)
end

let worker_opts_t =
Expand Down
2 changes: 1 addition & 1 deletion obuilder
Open in desktop
Submodule obuilder updated 15 files
+0 −41 dune-project
+0 −9 lib/build.ml
+39 −28 lib/docker.ml
+38 −1 lib/dune
+1 −1 lib/obuilder.ml
+2 −0 lib/os_specific_utils.freebsd.ml
+2 −0 lib/os_specific_utils.linux.ml
+1 −0 lib/os_specific_utils.mli
+1 −1 lib/sandbox.mli
+0 −0 lib/sandbox.runc.ml
+119 −0 lib/sandbox.runj.ml
+1 −1 main.ml
+0 −1 obuilder-spec.opam
+2 −1 obuilder.opam
+1 −1 stress/stress.ml
2 changes: 1 addition & 1 deletion worker/cluster_worker.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ type job_spec = [
module Obuilder_config : sig
type t

val v : Obuilder.Runc_sandbox.config -> [ `Btrfs of string | `Rsync of string | `Zfs of string ] -> t
val v : Obuilder.Sandbox.config -> [ `Btrfs of string | `Rsync of string | `Zfs of string ] -> t
end

type build =
Expand Down
4 changes: 2 additions & 2 deletions worker/obuilder_build.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ type builder = Builder : (module Obuilder.BUILDER with type t = 'a) * 'a -> buil
module Config = struct
type t = {
store_spec : [ `Btrfs of string | `Rsync of string | `Zfs of string ];
sandbox_config : Obuilder.Runc_sandbox.config;
sandbox_config : Obuilder.Sandbox.config;
}

let v sandbox_config store_spec = { store_spec; sandbox_config }
Expand All @@ -21,7 +21,7 @@ type t = {
prune_threshold : float option;
}

module Sandbox = Obuilder.Runc_sandbox
module Sandbox = Obuilder.Sandbox
module Fetcher = Obuilder.Docker

let ( / ) = Filename.concat
Expand Down
2 changes: 1 addition & 1 deletion worker/obuilder_build.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ type t
module Config : sig
type t

val v : Obuilder.Runc_sandbox.config -> [ `Btrfs of string | `Rsync of string | `Zfs of string ] -> t
val v : Obuilder.Sandbox.config -> [ `Btrfs of string | `Rsync of string | `Zfs of string ] -> t
end

val create : ?prune_threshold:float -> Config.t -> t Lwt.t
Expand Down