From 97f49cf336ad20c90e1ad6d9819ff8cea3c791e1 Mon Sep 17 00:00:00 2001 From: matejcik Date: Wed, 2 Jun 2021 14:49:46 +0200 Subject: [PATCH] fix(legacy): fix protobuf build [no changelog] --- legacy/firmware/protob/Makefile | 18 +++++++++++------- legacy/firmware/protob/messages-debug.options | 2 -- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/legacy/firmware/protob/Makefile b/legacy/firmware/protob/Makefile index 33f3e5d0a..ad5a9d984 100644 --- a/legacy/firmware/protob/Makefile +++ b/legacy/firmware/protob/Makefile @@ -12,13 +12,21 @@ ifeq ($(BITCOIN_ONLY), 1) SKIPPED_MESSAGES += Ethereum Lisk NEM Stellar endif -all: messages_map.h messages_map_limits.h messages-bitcoin.pb.h messages-common.pb.h messages-crypto.pb.h messages-debug.pb.h messages-ethereum.pb.h messages-management.pb.h messages-nem.pb.h messages.pb.h messages-stellar.pb.h messages-lisk.pb.h messages_nem_pb2.py +PROTO_NAMES = messages messages-bitcoin messages-common messages-crypto messages-debug \ + messages-ethereum messages-lisk messages-management messages-nem messages-stellar + +PROTO_OPTIONS = $(PROTO_NAMES:=.options) +PROTO_COMPILED = $(PROTO_NAMES:=.pb) +PROTO_HEADERS = $(PROTO_COMPILED:=.h) + +all: messages_map.h messages_map_limits.h messages.pb.h PYTHON ?= python -%.pb.h: %.pb %.options +# produces also all of $(PROTO_HEADERS) +messages.pb.h: $(PROTO_COMPILED) $(PROTO_OPTIONS) @printf " NANOPB $@\n" - $(Q)nanopb_generator $< \ + $(Q)nanopb_generator $(PROTO_COMPILED) \ -L '#include "%s"' \ -T -D . \ -s "mangle_names:M_FLATTEN" @@ -28,10 +36,6 @@ PYTHON ?= python @printf " PROTOC $@\n" $(Q)protoc -I/usr/include -I. $< -o $@ -messages_%_pb2.py: messages-%.proto - @printf " PROTOC $@\n" - $(Q)protoc -I/usr/include -I. $< --python_out=. - %_pb2.py: %.proto @printf " PROTOC $@\n" $(Q)protoc -I/usr/include -I. $< --python_out=. diff --git a/legacy/firmware/protob/messages-debug.options b/legacy/firmware/protob/messages-debug.options index 87c7643be..399c201fd 100644 --- a/legacy/firmware/protob/messages-debug.options +++ b/legacy/firmware/protob/messages-debug.options @@ -20,5 +20,3 @@ DebugLinkMemoryWrite.memory max_size:1024 # Unused messages. DebugLinkLayout skip_message:true DebugLinkRecordScreen skip_message:true -DebugLinkShowText skip_message:true -DebugLinkShowTextItem skip_message:true