-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Currently `copy` and `diskwriter` packages can't be built on FreeBSD: - copy package lacks implementation of `copyFile` & `copyFileContent` functions. - diskwriter package assumes 32-bit device nodes, and FreeBSD uses 64 ones. This change * Fixes FreeBSD build issues * Fixes tests * Introduces a GH Actions job to run tests on FreeBSD. Signed-off-by: Artem Khramov <akhramov@pm.me>
- Loading branch information
Showing
9 changed files
with
120 additions
and
3 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,32 @@ | ||
// +build freebsd | ||
|
||
package fs | ||
|
||
import ( | ||
"io" | ||
"os" | ||
|
||
"github.com/pkg/errors" | ||
) | ||
|
||
func copyFile(source, target string) error { | ||
src, err := os.Open(source) | ||
if err != nil { | ||
return errors.Wrapf(err, "failed to open source %s", source) | ||
} | ||
defer src.Close() | ||
tgt, err := os.Create(target) | ||
if err != nil { | ||
return errors.Wrapf(err, "failed to open target %s", target) | ||
} | ||
defer tgt.Close() | ||
|
||
return copyFileContent(tgt, src) | ||
} | ||
|
||
func copyFileContent(dst, src *os.File) error { | ||
buf := bufferPool.Get().(*[]byte) | ||
_, err := io.CopyBuffer(dst, src, *buf) | ||
bufferPool.Put(buf) | ||
return err | ||
} |
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,14 @@ | ||
// +build freebsd | ||
|
||
package fsutil | ||
|
||
import ( | ||
"github.com/tonistiigi/fsutil/types" | ||
"golang.org/x/sys/unix" | ||
) | ||
|
||
func createSpecialFile(path string, mode uint32, stat *types.Stat) error { | ||
dev := unix.Mkdev(uint32(stat.Devmajor), uint32(stat.Devminor)) | ||
|
||
return unix.Mknod(path, mode, dev) | ||
} |
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,13 @@ | ||
// +build !windows,!freebsd | ||
|
||
package fsutil | ||
|
||
import ( | ||
"syscall" | ||
|
||
"github.com/tonistiigi/fsutil/types" | ||
) | ||
|
||
func createSpecialFile(path string, mode uint32, stat *types.Stat) error { | ||
return syscall.Mknod(path, mode, int(mkdev(stat.Devmajor, stat.Devminor))) | ||
} |
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,37 @@ | ||
# This code is taken from the Vagrantfile from libjail-rs | ||
# https://github.com/fubarnetes/libjail-rs/blob/727353bd6565c5e7a9be2664258d0197a1c8bb35/Vagrantfile | ||
# licensed under BSD-3 Clause License: | ||
# BSD 3-Clause License | ||
|
||
# Copyright (c) 2018, Fabian Freyer <fabian.freyer@physik.tu-berlin.de> All rights reserved. | ||
|
||
# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: | ||
|
||
# * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. | ||
|
||
# * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. | ||
|
||
# * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. | ||
|
||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
||
Vagrant.configure("2") do |config| | ||
# Unreleased version | ||
# | ||
# config.vm.define "fbsd_14_0" do |fbsd_14_0| | ||
# fbsd_14_0.vm.box = "freebsd/FreeBSD-14.0-CURRENT" | ||
# end | ||
|
||
# Stable version | ||
# | ||
config.vm.define "fbsd_13_0" do |fbsd_13_0| | ||
fbsd_13_0.vm.box = "freebsd/FreeBSD-13.0-STABLE" | ||
end | ||
|
||
config.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__auto: true | ||
|
||
config.vm.provision "shell", inline: <<-SHELL | ||
pkg bootstrap | ||
pkg install -y go | ||
SHELL | ||
end |
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