go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Drop support for Go 1.10 

PiperOrigin-RevId: 210589588
Change-Id: Iba898bc3eb8f13e17c668ceea6dc820fc8180a70
This commit is contained in:
Michael Pratt 2018-08-28 12:55:11 -07:00 committed by Shentubot
parent d8f0db9bcf
commit ea113a4380
4 changed files with 1 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runsc/boot/filter/BUILD
View File

@ -6,8 +6,6 @@ go_library(
name = "filter",
srcs = [
"config.go",
"config_go110.go",
"config_go111.go",
"extra_filters.go",
"extra_filters_msan.go",
"extra_filters_race.go",

1
runsc/boot/filter/config.go
View File

@ -60,6 +60,7 @@ var allowedSyscalls = seccomp.SyscallRules{
syscall.SYS_MMAP: {},
syscall.SYS_MPROTECT: {},
syscall.SYS_MUNMAP: {},
syscall.SYS_NANOSLEEP: {},
syscall.SYS_POLL: {},
syscall.SYS_PREAD64: {},
syscall.SYS_PWRITE64: {},

30
runsc/boot/filter/config_go110.go
View File

@ -1,30 +0,0 @@
// Copyright 2018 Google Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// +build !go1.11
package filter
import (
"syscall"
"gvisor.googlesource.com/gvisor/pkg/seccomp"
)
// TODO: Remove this file and merge config_go111.go back into
// config.go once we no longer build with Go 1.10.
func init() {
allowedSyscalls[syscall.SYS_PSELECT6] = []seccomp.Rule{}
}

27
runsc/boot/filter/config_go111.go
View File

@ -1,27 +0,0 @@
// Copyright 2018 Google Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// +build go1.11
package filter
import (
"syscall"
"gvisor.googlesource.com/gvisor/pkg/seccomp"
)
func init() {
allowedSyscalls[syscall.SYS_NANOSLEEP] = []seccomp.Rule{}
}