Merge pull request #90 from snprajwal/proto-rename

Add package name to crit protobuf files

Author: rst0git

crit/Makefile

@@ -17,9 +17,14 @@ 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 conflicts against protobuf files
+	# from other projects, the files of this repository are
+	# now registered under the package name `criu`.
+	ls ./images/*.proto | xargs sed -i '/syntax/a package criu;'
 
 gen-proto:
+	rm ./images/*.pb.go || true
 	@protoc \
 		--proto_path=$(proto_path) \
 		--go_out=$(proto_path) \

crit/images/apparmor.pb.go

@@ -1,4 +1,5 @@
 syntax = "proto2";
+package criu;
 
 message aa_policy {
 	required string		name	= 1;

crit/images/apparmor.proto

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 
 syntax = "proto2";
+package criu;
 
 message autofs_entry {
 	required int32		fd			= 1;

crit/images/autofs.pb.go

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 
 syntax = "proto2";
+package criu;
 
 message binfmt_misc_entry {
 	required string		name			= 1;

crit/images/autofs.proto

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 
 syntax = "proto2";
+package criu;
 
 message bpfmap_data_entry {
 	required uint32	map_id			= 1;