mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 09:58:09 +00:00
Code Issues Releases Wiki Activity

image: use protoc instead of protoc-c

Browse Source 
The new protoc 1.5.2 reports warnings:
`protoc-c` is deprecated. Please use `protoc` instead!

Signed-off-by: Andrei Vagin <avagin@gmail.com>
This commit is contained in:
Andrei Vagin 2025-05-16 19:26:01 +00:00 committed by Radostin Stoyanov
parent 0d15e2f4d9
commit 3a3a3f0f27
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
images/Makefile
View File

@ -58,7 +58,7 @@ proto-obj-y += ext-file.o
proto-obj-y += cgroup.o proto-obj-y += cgroup.o
proto-obj-y += userns.o proto-obj-y += userns.o
proto-obj-y += pidns.o proto-obj-y += pidns.o
proto-obj-y += google/protobuf/descriptor.o # To make protoc-c happy and compile opts.proto proto-obj-y += google/protobuf/descriptor.o # To make protoc happy and compile opts.proto
proto-obj-y += opts.o proto-obj-y += opts.o
proto-obj-y += seccomp.o proto-obj-y += seccomp.o
proto-obj-y += binfmt-misc.o proto-obj-y += binfmt-misc.o
@ -96,7 +96,7 @@ makefile-deps := Makefile $(obj)/Makefile
define gen-proto-rules define gen-proto-rules
$(obj)/$(1).pb-c.c $(obj)/$(1).pb-c.h: $(obj)/$(1).proto $(addsuffix .pb-c.c,$(addprefix $(obj)/,$(2))) $(makefile-deps) $(obj)/$(1).pb-c.c $(obj)/$(1).pb-c.h: $(obj)/$(1).proto $(addsuffix .pb-c.c,$(addprefix $(obj)/,$(2))) $(makefile-deps)
$$(E) " PBCC " $$@ $$(E) " PBCC " $$@
$$(Q) protoc-c --proto_path=$(obj)/ --c_out=$(obj)/ $$< $$(Q) protoc --proto_path=$(obj)/ --c_out=$(obj)/ $$<
ifeq ($(PROTOUFIX),y) ifeq ($(PROTOUFIX),y)
$$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$@ $$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$@
$$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$(patsubst %.c,%.h,$$@) $$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$(patsubst %.c,%.h,$$@)

2
plugins/amdgpu/Makefile
View File

@ -25,7 +25,7 @@ else
endif endif
criu-amdgpu.pb-c.c: criu-amdgpu.proto criu-amdgpu.pb-c.c: criu-amdgpu.proto
protoc-c --proto_path=. --c_out=. criu-amdgpu.proto protoc --proto_path=. --c_out=. criu-amdgpu.proto
amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_drm.c amdgpu_plugin_topology.c amdgpu_plugin_util.c criu-amdgpu.pb-c.c amdgpu_socket_utils.c amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_drm.c amdgpu_plugin_topology.c amdgpu_plugin_util.c criu-amdgpu.pb-c.c amdgpu_socket_utils.c
$(CC) $(PLUGIN_CFLAGS) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS) $(LIBDRM_INC) $(CC) $(PLUGIN_CFLAGS) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS) $(LIBDRM_INC)

2
test/others/rpc/Makefile
View File

@ -47,7 +47,7 @@ rpc_pb2.py: rpc.proto
protoc --proto_path=. --python_out=. rpc.proto protoc --proto_path=. --python_out=. rpc.proto
rpc.pb-c.c: rpc.proto rpc.pb-c.c: rpc.proto
protoc-c --proto_path=. --c_out=. rpc.proto protoc --proto_path=. --c_out=. rpc.proto
clean: clean:
rm -rf build rpc.pb-c.o test-c.o test-c rpc.pb-c.c rpc.pb-c.h rpc_pb2.py rpc_pb2.pyc criu rm -rf build rpc.pb-c.o test-c.o test-c rpc.pb-c.c rpc.pb-c.h rpc_pb2.py rpc_pb2.pyc criu

2
test/others/unix-callback/Makefile
View File

@ -4,7 +4,7 @@ run: all
./run.sh ./run.sh
unix.pb-c.c: unix.proto unix.pb-c.c: unix.proto
protoc-c --proto_path=. --c_out=. unix.proto protoc --proto_path=. --c_out=. unix.proto
unix-lib.so: unix-lib.c unix.pb-c.c unix-lib.so: unix-lib.c unix.pb-c.c
gcc -g -Werror -Wall -shared -nostartfiles unix-lib.c unix.pb-c.c -o unix-lib.so -iquote ../../../criu/include -fPIC gcc -g -Werror -Wall -shared -nostartfiles unix-lib.c unix.pb-c.c -o unix-lib.so -iquote ../../../criu/include -fPIC

2
test/zdtm/static/Makefile
View File

@ -734,7 +734,7 @@ criu-rtc.pb-c.c: criu-rtc.proto
$(Q)echo $@ >> .gitignore $(Q)echo $@ >> .gitignore
$(Q)echo $(@:%.c=%.h) >> .gitignore $(Q)echo $(@:%.c=%.h) >> .gitignore
$(E) " PBCC " $@ $(E) " PBCC " $@
$(Q)protoc-c --proto_path=. --c_out=. criu-rtc.proto $(Q)protoc --proto_path=. --c_out=. criu-rtc.proto
criu-rtc.so: criu-rtc.c criu-rtc.pb-c.c criu-rtc.so: criu-rtc.c criu-rtc.pb-c.c
$(E) " LD " $@ $(E) " LD " $@