Merge pull request #9682 from AkihiroSuda/mv-seccomp-kernelversion

mv contrib/seccomp/kernelversion pkg/kernelversion

contrib/seccomp/seccomp_default.go

@@ -23,7 +23,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/containerd/containerd/v2/contrib/seccomp/kernelversion"
+	"github.com/containerd/containerd/v2/pkg/kernelversion"
 	"github.com/opencontainers/runtime-spec/specs-go"
 )
 

core/mount/losetup_linux.go

@@ -25,8 +25,8 @@ import (
 	"time"
 	"unsafe"
 
-	kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion"
 	"github.com/containerd/containerd/v2/internal/randutil"
+	kernel "github.com/containerd/containerd/v2/pkg/kernelversion"
 	"golang.org/x/sys/unix"
 )
 

core/mount/mount_idmapped_linux_test.go

@@ -23,7 +23,7 @@ import (
 	"syscall"
 	"testing"
 
-	kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion"
+	kernel "github.com/containerd/containerd/v2/pkg/kernelversion"
 	"github.com/containerd/continuity/testutil"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sys/unix"

pkg/cri/config/config_kernel_linux.go

@@ -23,7 +23,7 @@ import (
 	"errors"
 	"fmt"
 
-	kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion"
+	kernel "github.com/containerd/containerd/v2/pkg/kernelversion"
 )
 
 var kernelGreaterEqualThan = kernel.GreaterEqualThan

pkg/cri/config/config_kernel_linux_test.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"testing"
 
-	kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion"
+	kernel "github.com/containerd/containerd/v2/pkg/kernelversion"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/kernelversion/kernel_linux.go

@@ -12,7 +12,9 @@
    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.
+*/
 
+/*
    File copied and customized based on
    https://github.com/moby/moby/tree/v20.10.14/profiles/seccomp/kernel_linux.go
 */

pkg/kernelversion/kernel_linux_test.go

@@ -12,7 +12,9 @@
    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.
+*/
 
+/*
    File copied and customized based on
    https://github.com/moby/moby/tree/v20.10.14/profiles/seccomp/kernel_linux_test.go
 */

plugins/snapshots/overlay/overlayutils/check.go

@@ -26,8 +26,8 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion"
 	"github.com/containerd/containerd/v2/core/mount"
+	kernel "github.com/containerd/containerd/v2/pkg/kernelversion"
 	"github.com/containerd/containerd/v2/pkg/userns"
 	"github.com/containerd/continuity/fs"
 	"github.com/containerd/log"