fix(crit): rename sa.proto and core.proto

Due to a namespace conflict of vendored .proto files in Podman, these two files have been renamed with a `criu-` prefix. Signed-off-by: Prajwal S N <[email protected]>
checkpoint-restore · Sep 3, 2022 · b3f89ee · b3f89ee
1 parent 287ed08
commit b3f89ee
Show file tree

Hide file tree

Showing 77 changed files with 458 additions and 469 deletions.
diff --git a/crit/Makefile b/crit/Makefile
@@ -17,7 +17,13 @@ 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
+	# FIXME: There is a namespace conflict in Podman with sa.proto and core.proto
+	# against vendored .proto files from https://github.com/letsencrypt/boulder
+	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:
 	@protoc \

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