Commit ab81e203 authored by Jakub Sitnicki's avatar Jakub Sitnicki Committed by Alexei Starovoitov

scripts/bpf: Print an error when known types list needs updating

Don't generate a broken bpf_helper_defs.h header if the helper script needs
updating because it doesn't recognize a newly added type. Instead print an
error that explains why the build is failing, clean up the partially
generated header and stop.

v1->v2:
- Switched from temporary file to .DELETE_ON_ERROR.

Fixes: 456a513b ("scripts/bpf: Emit an #error directive known types list needs updating")
Suggested-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20191020112344.19395-1-jakub@cloudflare.com
parent 54b8625c
...@@ -488,8 +488,8 @@ class PrinterHelpers(Printer): ...@@ -488,8 +488,8 @@ class PrinterHelpers(Printer):
return t return t
if t in self.mapped_types: if t in self.mapped_types:
return self.mapped_types[t] return self.mapped_types[t]
print("") print("Unrecognized type '%s', please add it to known types!" % t,
print("#error \"Unrecognized type '%s', please add it to known types!\"" % t) file=sys.stderr)
sys.exit(1) sys.exit(1)
seen_helpers = set() seen_helpers = set()
......
...@@ -286,3 +286,6 @@ tags: ...@@ -286,3 +286,6 @@ tags:
# Declare the contents of the .PHONY variable as phony. We keep that # Declare the contents of the .PHONY variable as phony. We keep that
# information in a variable so we can use it in if_changed and friends. # information in a variable so we can use it in if_changed and friends.
.PHONY: $(PHONY) .PHONY: $(PHONY)
# Delete partially updated (corrupted) files on error
.DELETE_ON_ERROR:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment