Merge pull request #7087 from kzys/fuzz-less-hacks

Remove hacks around contrib/fuzz

cmd/containerd/builtins/aufs_linux.go

@@ -17,6 +17,6 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import _ "github.com/containerd/aufs/plugin"

cmd/containerd/builtins/btrfs_linux.go

@@ -17,6 +17,6 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import _ "github.com/containerd/containerd/snapshots/btrfs/plugin"

cmd/containerd/builtins/builtins.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 // register containerd builtins here
 import (

cmd/containerd/builtins/builtins_freebsd.go

@@ -14,6 +14,6 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import _ "github.com/containerd/zfs/plugin"

cmd/containerd/builtins/builtins_linux.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import (
 	_ "github.com/containerd/containerd/metrics/cgroups"

cmd/containerd/builtins/builtins_unix.go

@@ -17,7 +17,7 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import (
 	_ "github.com/containerd/containerd/snapshots/native/plugin"

cmd/containerd/builtins/builtins_windows.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import (
 	_ "github.com/containerd/containerd/diff/lcow"

cmd/containerd/builtins/devmapper_linux.go

@@ -17,6 +17,6 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import _ "github.com/containerd/containerd/snapshots/devmapper/plugin"

cmd/containerd/builtins/tracing.go

@@ -17,7 +17,7 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import (
 	_ "github.com/containerd/containerd/tracing/plugin"

cmd/containerd/builtins/zfs_linux.go

@@ -17,6 +17,6 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import _ "github.com/containerd/zfs/plugin"

cmd/containerd/builtins_cri.go

@@ -1,22 +0,0 @@
-//go:build (linux && !no_cri) || (windows && !no_cri) || (darwin && !no_cri)
-// +build linux,!no_cri windows,!no_cri darwin,!no_cri
-
-/*
-   Copyright The containerd Authors.
-
-   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.
-*/
-
-package main
-
-import _ "github.com/containerd/containerd/pkg/cri"

cmd/containerd/main.go

@@ -22,6 +22,9 @@ import (
 
 	"github.com/containerd/containerd/cmd/containerd/command"
 	"github.com/containerd/containerd/pkg/seed"
+
+	_ "github.com/containerd/containerd/cmd/containerd/builtins"
+	_ "github.com/containerd/containerd/pkg/cri"
 )
 
 func init() {