forked from containers/podman
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request containers#15290 from dfr/freebsd-build
FreeBSD build fixes for pkg/util and pkg/machine
- Loading branch information
Showing
6 changed files
with
54 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
//go:build freebsd | ||
// +build freebsd | ||
|
||
package machine | ||
|
||
func getLocalTimeZone() (string, error) { | ||
return "", nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package qemu | ||
|
||
import ( | ||
"os" | ||
) | ||
|
||
func getRuntimeDir() (string, error) { | ||
tmpDir, ok := os.LookupEnv("TMPDIR") | ||
if !ok { | ||
tmpDir = "/tmp" | ||
} | ||
return tmpDir, nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package qemu | ||
|
||
var ( | ||
QemuCommand = "qemu-system-x86_64" | ||
) | ||
|
||
func (v *MachineVM) addArchOptions() []string { | ||
opts := []string{"-machine", "q35,accel=hvf:tcg", "-cpu", "host"} | ||
return opts | ||
} | ||
|
||
func (v *MachineVM) prepare() error { | ||
return nil | ||
} | ||
|
||
func (v *MachineVM) archRemovalFiles() []string { | ||
return []string{} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
//go:build freebsd | ||
// +build freebsd | ||
|
||
package util | ||
|
||
import ( | ||
"errors" | ||
) | ||
|
||
func GetContainerPidInformationDescriptors() ([]string, error) { | ||
return []string{}, errors.New("this function is not supported on freebsd") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters