Gitiles
Code Review Sign In
gerrit-dev.monogon.dev / monogon / f369cfa3ab4ad5ba882fa66f2fd1c3df8e5b4495 / . / third_party / go / patches / gvisor-containerd-shim-build.patch
blob: e221fe8606102aee4f723aff694824264588414c [file] [log] [blame]
Lorenz Brunc88c82d2020-05-08 14:35:04 +0200[diff] [blame]1Copyright 2020 The Monogon Project Authors.
2
3Licensed under the Apache License, Version 2.0 (the "License");
4you may not use this file except in compliance with the License.
5You may obtain a copy of the License at
6
7 http://www.apache.org/licenses/LICENSE-2.0
8
9Unless required by applicable law or agreed to in writing, software
10distributed under the License is distributed on an "AS IS" BASIS,
11WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12See the License for the specific language governing permissions and
13limitations under the License.
14
15
16From d92dc4195d4de5149e7e55890fa856837a35217e Mon Sep 17 00:00:00 2001
17From: Lorenz Brun <lorenz@brun.one>
18Date: Mon, 4 May 2020 15:33:40 +0200
19Subject: [PATCH] Reflect code patches in Bazel and build pure
20
21---
22 cmd/containerd-shim-runsc-v1/BUILD.bazel | 1 +
23 cmd/gvisor-containerd-shim/BUILD.bazel | 4 ++--
24 pkg/v1/proc/BUILD.bazel | 3 ++-
25 pkg/v1/shim/BUILD.bazel | 5 +++--
26 pkg/v2/BUILD.bazel | 14 ++++++++------
27 5 files changed, 16 insertions(+), 11 deletions(-)
28
29diff --git a/cmd/containerd-shim-runsc-v1/BUILD.bazel b/cmd/containerd-shim-runsc-v1/BUILD.bazel
30index 8fb6a86..d58f069 100644
31--- a/cmd/containerd-shim-runsc-v1/BUILD.bazel
32+++ b/cmd/containerd-shim-runsc-v1/BUILD.bazel
33@@ -14,5 +14,6 @@ go_library(
34 go_binary(
35 name = "containerd-shim-runsc-v1",
36 embed = [":go_default_library"],
37+ pure = "on",
38 visibility = ["//visibility:public"],
39 )
40diff --git a/cmd/gvisor-containerd-shim/BUILD.bazel b/cmd/gvisor-containerd-shim/BUILD.bazel
41index 8478746..f6a6fa2 100644
42--- a/cmd/gvisor-containerd-shim/BUILD.bazel
43+++ b/cmd/gvisor-containerd-shim/BUILD.bazel
44@@ -14,9 +14,9 @@ go_library(
45 "@com_github_burntsushi_toml//:go_default_library",
46 "@com_github_containerd_containerd//events:go_default_library",
47 "@com_github_containerd_containerd//namespaces:go_default_library",
48- "@com_github_containerd_containerd//runtime/v1/linux/proc:go_default_library",
49- "@com_github_containerd_containerd//runtime/v1/shim:go_default_library",
50+ "@com_github_containerd_containerd//pkg/process:go_default_library",
51 "@com_github_containerd_containerd//runtime/v1/shim/v1:go_default_library",
52+ "@com_github_containerd_containerd//sys/reaper:go_default_library",
53 "@com_github_containerd_ttrpc//:go_default_library",
54 "@com_github_containerd_typeurl//:go_default_library",
55 "@com_github_gogo_protobuf//types:go_default_library",
56diff --git a/pkg/v1/proc/BUILD.bazel b/pkg/v1/proc/BUILD.bazel
57index 8ef457c..1bf9228 100644
58--- a/pkg/v1/proc/BUILD.bazel
59+++ b/pkg/v1/proc/BUILD.bazel
60@@ -21,7 +21,8 @@ go_library(
61 "@com_github_containerd_containerd//errdefs:go_default_library",
62 "@com_github_containerd_containerd//log:go_default_library",
63 "@com_github_containerd_containerd//mount:go_default_library",
64- "@com_github_containerd_containerd//runtime/proc:go_default_library",
65+ "@com_github_containerd_containerd//pkg/process:go_default_library",
66+ "@com_github_containerd_containerd//pkg/stdio:go_default_library",
67 "@com_github_containerd_fifo//:go_default_library",
68 "@com_github_containerd_go_runc//:go_default_library",
69 "@com_github_gogo_protobuf//types:go_default_library",
70diff --git a/pkg/v1/shim/BUILD.bazel b/pkg/v1/shim/BUILD.bazel
71index a5d83c4..2129cd8 100644
72--- a/pkg/v1/shim/BUILD.bazel
73+++ b/pkg/v1/shim/BUILD.bazel
74@@ -20,11 +20,12 @@ go_library(
75 "@com_github_containerd_containerd//log:go_default_library",
76 "@com_github_containerd_containerd//mount:go_default_library",
77 "@com_github_containerd_containerd//namespaces:go_default_library",
78+ "@com_github_containerd_containerd//pkg/process:go_default_library",
79+ "@com_github_containerd_containerd//pkg/stdio:go_default_library",
80 "@com_github_containerd_containerd//runtime:go_default_library",
81 "@com_github_containerd_containerd//runtime/linux/runctypes:go_default_library",
82- "@com_github_containerd_containerd//runtime/proc:go_default_library",
83- "@com_github_containerd_containerd//runtime/v1/shim:go_default_library",
84 "@com_github_containerd_containerd//runtime/v1/shim/v1:go_default_library",
85+ "@com_github_containerd_containerd//sys/reaper:go_default_library",
86 "@com_github_containerd_fifo//:go_default_library",
87 "@com_github_containerd_typeurl//:go_default_library",
88 "@com_github_gogo_protobuf//types:go_default_library",
89diff --git a/pkg/v2/BUILD.bazel b/pkg/v2/BUILD.bazel
90index a7a6abb..d61b785 100644
91--- a/pkg/v2/BUILD.bazel
92+++ b/pkg/v2/BUILD.bazel
93@@ -16,20 +16,21 @@ go_library(
94 "//pkg/v1/utils:go_default_library",
95 "//pkg/v2/options:go_default_library",
96 "@com_github_burntsushi_toml//:go_default_library",
97- "@com_github_containerd_cgroups//:go_default_library",
98+ "@com_github_containerd_cgroups//stats/v1:go_default_library",
99 "@com_github_containerd_console//:go_default_library",
100 "@com_github_containerd_containerd//api/events:go_default_library",
101 "@com_github_containerd_containerd//api/types/task:go_default_library",
102 "@com_github_containerd_containerd//errdefs:go_default_library",
103- "@com_github_containerd_containerd//events:go_default_library",
104 "@com_github_containerd_containerd//log:go_default_library",
105 "@com_github_containerd_containerd//mount:go_default_library",
106 "@com_github_containerd_containerd//namespaces:go_default_library",
107+ "@com_github_containerd_containerd//pkg/process:go_default_library",
108+ "@com_github_containerd_containerd//pkg/stdio:go_default_library",
109 "@com_github_containerd_containerd//runtime:go_default_library",
110 "@com_github_containerd_containerd//runtime/linux/runctypes:go_default_library",
111- "@com_github_containerd_containerd//runtime/proc:go_default_library",
112 "@com_github_containerd_containerd//runtime/v2/shim:go_default_library",
113 "@com_github_containerd_containerd//runtime/v2/task:go_default_library",
114+ "@com_github_containerd_containerd//sys/reaper:go_default_library",
115 "@com_github_containerd_cri//pkg/api/runtimeoptions/v1:go_default_library",
116 "@com_github_containerd_fifo//:go_default_library",
117 "@com_github_containerd_typeurl//:go_default_library",
118@@ -44,20 +45,21 @@ go_library(
119 "//pkg/v1/utils:go_default_library",
120 "//pkg/v2/options:go_default_library",
121 "@com_github_burntsushi_toml//:go_default_library",
122- "@com_github_containerd_cgroups//:go_default_library",
123+ "@com_github_containerd_cgroups//stats/v1:go_default_library",
124 "@com_github_containerd_console//:go_default_library",
125 "@com_github_containerd_containerd//api/events:go_default_library",
126 "@com_github_containerd_containerd//api/types/task:go_default_library",
127 "@com_github_containerd_containerd//errdefs:go_default_library",
128- "@com_github_containerd_containerd//events:go_default_library",
129 "@com_github_containerd_containerd//log:go_default_library",
130 "@com_github_containerd_containerd//mount:go_default_library",
131 "@com_github_containerd_containerd//namespaces:go_default_library",
132+ "@com_github_containerd_containerd//pkg/process:go_default_library",
133+ "@com_github_containerd_containerd//pkg/stdio:go_default_library",
134 "@com_github_containerd_containerd//runtime:go_default_library",
135 "@com_github_containerd_containerd//runtime/linux/runctypes:go_default_library",
136- "@com_github_containerd_containerd//runtime/proc:go_default_library",
137 "@com_github_containerd_containerd//runtime/v2/shim:go_default_library",
138 "@com_github_containerd_containerd//runtime/v2/task:go_default_library",
139+ "@com_github_containerd_containerd//sys/reaper:go_default_library",
140 "@com_github_containerd_cri//pkg/api/runtimeoptions/v1:go_default_library",
141 "@com_github_containerd_fifo//:go_default_library",
142 "@com_github_containerd_typeurl//:go_default_library",
143--
1442.25.1
145