From fe767f95c7fb0f6b8e8e8edaa149648dd7b84752 Mon Sep 17 00:00:00 2001
From: Shengjing Zhu <zhsj@debian.org>
Date: Sun, 22 Nov 2020 16:14:57 +0800
Subject: [PATCH] Fix package name in cri runtimeoptions protobuf

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
---
 pkg/cri/runtimeoptions/v1/api.pb.go | 35 +++++++++++++++--------------
 pkg/cri/runtimeoptions/v1/api.proto |  4 ++--
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/pkg/cri/runtimeoptions/v1/api.pb.go b/pkg/cri/runtimeoptions/v1/api.pb.go
index 63e33f475..3cc86ac4f 100644
--- a/pkg/cri/runtimeoptions/v1/api.pb.go
+++ b/pkg/cri/runtimeoptions/v1/api.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: github.com/containerd/containerd/pkg/api/runtimeoptions/v1/api.proto
+// source: github.com/containerd/containerd/pkg/cri/runtimeoptions/v1/api.proto
 
 package cri_runtimeoptions_v1
 
@@ -38,7 +38,7 @@ type Options struct {
 func (m *Options) Reset()      { *m = Options{} }
 func (*Options) ProtoMessage() {}
 func (*Options) Descriptor() ([]byte, []int) {
-	return fileDescriptor_8398b2d76ed13c1c, []int{0}
+	return fileDescriptor_fe2c17d0693aba39, []int{0}
 }
 func (m *Options) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -86,25 +86,26 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("github.com/containerd/containerd/pkg/api/runtimeoptions/v1/api.proto", fileDescriptor_8398b2d76ed13c1c)
+	proto.RegisterFile("github.com/containerd/containerd/pkg/cri/runtimeoptions/v1/api.proto", fileDescriptor_fe2c17d0693aba39)
 }
 
-var fileDescriptor_8398b2d76ed13c1c = []byte{
-	// 224 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_fe2c17d0693aba39 = []byte{
+	// 226 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x49, 0xcf, 0x2c, 0xc9,
 	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d,
-	0x4a, 0x41, 0x66, 0x16, 0x64, 0xa7, 0xeb, 0x27, 0x16, 0x64, 0xea, 0x17, 0x95, 0xe6, 0x95, 0x64,
-	0xe6, 0xa6, 0xe6, 0x17, 0x94, 0x64, 0xe6, 0xe7, 0x15, 0xeb, 0x97, 0x19, 0x82, 0x44, 0xf5, 0x0a,
-	0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0x44, 0x93, 0x8b, 0x32, 0xf5, 0x50, 0x15, 0xe8, 0x95, 0x19, 0x4a,
-	0xe9, 0x22, 0x19, 0x9e, 0x9e, 0x9f, 0x9e, 0xaf, 0x0f, 0x56, 0x9d, 0x54, 0x9a, 0x06, 0xe6, 0x81,
-	0x39, 0x60, 0x16, 0xc4, 0x14, 0x25, 0x57, 0x2e, 0x76, 0x7f, 0x88, 0x66, 0x21, 0x49, 0x2e, 0x8e,
-	0x92, 0xca, 0x82, 0xd4, 0xf8, 0xd2, 0xa2, 0x1c, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x76,
-	0x10, 0x3f, 0xb4, 0x28, 0x47, 0x48, 0x9e, 0x8b, 0x3b, 0x39, 0x3f, 0x2f, 0x2d, 0x33, 0x3d, 0xbe,
-	0x20, 0xb1, 0x24, 0x43, 0x82, 0x09, 0x2c, 0xcb, 0x05, 0x11, 0x0a, 0x48, 0x2c, 0xc9, 0x70, 0xca,
-	0x3b, 0xf1, 0x50, 0x8e, 0xf1, 0xc6, 0x43, 0x39, 0x86, 0x86, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9,
-	0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x51, 0x01,
-	0xe4, 0x7b, 0xd8, 0x3a, 0xb9, 0x28, 0x33, 0x1e, 0x55, 0x34, 0xbe, 0xcc, 0x30, 0x89, 0x0d, 0xec,
-	0x7a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x97, 0xee, 0x94, 0x4b, 0x01, 0x00, 0x00,
+	0x4a, 0x41, 0x66, 0x16, 0x64, 0xa7, 0xeb, 0x27, 0x17, 0x65, 0xea, 0x17, 0x95, 0xe6, 0x95, 0x64,
+	0xe6, 0xa6, 0xe6, 0x17, 0x94, 0x64, 0xe6, 0xe7, 0x15, 0xeb, 0x97, 0x19, 0xea, 0x27, 0x16, 0x64,
+	0xea, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x89, 0x26, 0x17, 0x65, 0xea, 0xa1, 0x2a, 0xd0, 0x2b,
+	0x33, 0x94, 0xd2, 0x45, 0x32, 0x3c, 0x3d, 0x3f, 0x3d, 0x5f, 0x1f, 0xac, 0x3a, 0xa9, 0x34, 0x0d,
+	0xcc, 0x03, 0x73, 0xc0, 0x2c, 0x88, 0x29, 0x4a, 0xae, 0x5c, 0xec, 0xfe, 0x10, 0xcd, 0x42, 0x92,
+	0x5c, 0x1c, 0x25, 0x95, 0x05, 0xa9, 0xf1, 0xa5, 0x45, 0x39, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c,
+	0x41, 0xec, 0x20, 0x7e, 0x68, 0x51, 0x8e, 0x90, 0x3c, 0x17, 0x77, 0x72, 0x7e, 0x5e, 0x5a, 0x66,
+	0x7a, 0x7c, 0x41, 0x62, 0x49, 0x86, 0x04, 0x13, 0x58, 0x96, 0x0b, 0x22, 0x14, 0x90, 0x58, 0x92,
+	0xe1, 0x94, 0x77, 0xe2, 0xa1, 0x1c, 0xe3, 0x8d, 0x87, 0x72, 0x0c, 0x0d, 0x8f, 0xe4, 0x18, 0x4f,
+	0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18,
+	0xa2, 0x02, 0xc8, 0xf7, 0xb0, 0x75, 0x72, 0x51, 0x66, 0x3c, 0xaa, 0x68, 0x7c, 0x99, 0x61, 0x12,
+	0x1b, 0xd8, 0xf5, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdb, 0xe4, 0x59, 0xf7, 0x4b, 0x01,
+	0x00, 0x00,
 }
 
 func (m *Options) Marshal() (dAtA []byte, err error) {
diff --git a/pkg/cri/runtimeoptions/v1/api.proto b/pkg/cri/runtimeoptions/v1/api.proto
index e8bcde428..520f54f54 100644
--- a/pkg/cri/runtimeoptions/v1/api.proto
+++ b/pkg/cri/runtimeoptions/v1/api.proto
@@ -1,4 +1,4 @@
-// To regenerate api.pb.go run `make proto`
+// To regenerate api.pb.go run `make protos`
 syntax = "proto3";
 
 package cri.runtimeoptions.v1;
@@ -14,7 +14,7 @@ option (gogoproto.unmarshaler_all) = true;
 option (gogoproto.goproto_unrecognized_all) = false;
 
 
-option go_package = "github.com/containerd/containerd/pkg/api/runtimeoptions/v1;cri_runtimeoptions_v1";
+option go_package = "github.com/containerd/containerd/pkg/cri/runtimeoptions/v1;cri_runtimeoptions_v1";
 
 message Options {
 	// TypeUrl specifies the type of the content inside the config file.