crit/images: fix name conflict with letsencrypt

The core.proto and so.proto files provided by criu have conflicting names with the proto files included in https://github.com/letsencrypt/boulder Since protobuf v1.26.0 a hard error is reported when a compiled Go program starts up that has multiple conflicting protobuf names linked into it. This results in the following error when running the podman tests: panic: proto: file "sa.proto" is already registered previously from: "github.com/letsencrypt/boulder/sa/proto" currently from: "github.com/checkpoint-restore/go-criu/v6/crit/images" See https://developers.google.com/protocol-buffers/docs/reference/go/faq#namespace-conflict goroutine 1 [running]: google.golang.org/protobuf/reflect/protoregistry.glob..func1({0x1b0b380?, 0xc0004ce240?}, {0x1b0b380?, 0xc0004ce280}) /home/rst/tmp/libpod/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go:56 +0x1ee google.golang.org/protobuf/reflect/protoregistry.(*Files).RegisterFile(0xc0001a8678, {0x1b204c8?, 0xc0000fc000?}) /home/rst/tmp/libpod/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go:130 +0x39c google.golang.org/protobuf/internal/filedesc.Builder.Build({{0x153c2e0, 0x34}, {0x25a1a80, 0x100, 0x100}, 0x0, 0x1, 0x0, 0x0, {0x1b10fd0, ...}, ...}) /home/rst/tmp/libpod/vendor/google.golang.org/protobuf/internal/filedesc/build.go:112 +0x1d6 google.golang.org/protobuf/internal/filetype.Builder.Build({{{0x153c2e0, 0x34}, {0x25a1a80, 0x100, 0x100}, 0x0, 0x1, 0x0, 0x0, {0x0, ...}, ...}, ...}) /home/rst/tmp/libpod/vendor/google.golang.org/protobuf/internal/filetype/build.go:138 +0x19d github.com/checkpoint-restore/go-criu/v6/crit/images.file_sa_proto_init() /home/rst/tmp/libpod/vendor/github.com/checkpoint-restore/go-criu/v6/crit/images/sa.pb.go:190 +0x198 github.com/checkpoint-restore/go-criu/v6/crit/images.file_core_proto_init() /home/rst/tmp/libpod/vendor/github.com/checkpoint-restore/go-criu/v6/crit/images/core.pb.go:1109 +0x6f github.com/checkpoint-restore/go-criu/v6/crit/images.init.12() /home/rst/tmp/libpod/vendor/github.com/checkpoint-restore/go-criu/v6/crit/images/core.pb.go:1095 +0x17 path is /home/rst/tmp/libpod/.coverage Unable to read coverage file cmd/podman/coverprofile to combine, open cmd/podman/coverprofile: no such file or directory This patch fixes this error by prepending the `criu-` prefix to core.proto and so.proto. Fixes: #94 Co-developed-by: Prajwal S N <[email protected]> Signed-off-by: Radostin Stoyanov <[email protected]>
checkpoint-restore · Sep 7, 2022 · f70bde6 · f70bde6
1 parent 9f713a6
commit f70bde6
Show file tree

Hide file tree

Showing 77 changed files with 460 additions and 469 deletions.
diff --git a/crit/Makefile b/crit/Makefile
@@ -17,9 +17,17 @@ update-proto:
  rm ./images/*.proto || true
  git clone --depth 1 --branch master https://github.com/checkpoint-restore/criu criu-temp
  cp criu-temp/images/*.proto ./images/
- rm -R criu-temp
+ rm -rf criu-temp
+ # To prevent namespace conflict with proto files
+ # in github.com/letsencrypt/boulder, we prepend
+ # a prefix to the filenames.
+ mv ./images/sa.proto ./images/criu-sa.proto
+ sed -i 's/sa\.proto/criu-sa\.proto/g' images/*.proto
+ mv ./images/core.proto ./images/criu-core.proto
+ sed -i 's/core\.proto/criu-core\.proto/g' images/*.proto
 
 gen-proto:
+ rm -f ./images/*.pb.go
  @protoc \
  --proto_path=$(proto_path) \
  --go_out=$(proto_path) \

diff --git a/crit/images/apparmor.pb.go b/crit/images/apparmor.pb.go
diff --git a/crit/images/autofs.pb.go b/crit/images/autofs.pb.go
diff --git a/crit/images/binfmt-misc.pb.go b/crit/images/binfmt-misc.pb.go
diff --git a/crit/images/bpfmap-data.pb.go b/crit/images/bpfmap-data.pb.go
diff --git a/crit/images/bpfmap-file.pb.go b/crit/images/bpfmap-file.pb.go
diff --git a/crit/images/cgroup.pb.go b/crit/images/cgroup.pb.go
diff --git a/crit/images/core-aarch64.pb.go b/crit/images/core-aarch64.pb.go
diff --git a/crit/images/core-arm.pb.go b/crit/images/core-arm.pb.go
diff --git a/crit/images/core-mips.pb.go b/crit/images/core-mips.pb.go
diff --git a/crit/images/core-ppc64.pb.go b/crit/images/core-ppc64.pb.go
diff --git a/crit/images/core-s390.pb.go b/crit/images/core-s390.pb.go
diff --git a/crit/images/core-x86.pb.go b/crit/images/core-x86.pb.go
diff --git a/crit/images/cpuinfo.pb.go b/crit/images/cpuinfo.pb.go
diff --git a/crit/images/creds.pb.go b/crit/images/creds.pb.go