summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2024-01-04 17:15:47 +0200
committerKieran Bingham <kieran.bingham@ideasonboard.com>2024-01-09 15:39:05 +0000
commit8ac367fe0c7f923fd16f69df870bd5d1915368b8 (patch)
tree2df13838bdca5715672fc10219a4c6e78c6b5a69
parent3e4a211ff482f4a91fafec2c623c5b4e046ffdec (diff)
utils: ipc: generate.py: Disable attributes checker
The attributes checker ensures that .mojom files don't contain unknown attributes. These check fail with the custom 'skipSerdes' and 'async' libcamera attributes. Ideally the list of supported attributes should be extended, but that can't easily be done without modifying the mojo sources that we try to keep identical to the upstream version to make updates easier. Disable the attributes checker completely for now to fix this issue. While at it, fix an indentation issue reported by checkstyle.py. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Milan Zamazal <mzamazal@redhat.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rwxr-xr-xutils/ipc/generate.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/utils/ipc/generate.py b/utils/ipc/generate.py
index afaf018b..71bdee3b 100755
--- a/utils/ipc/generate.py
+++ b/utils/ipc/generate.py
@@ -17,7 +17,15 @@ sys.path.insert(0, f'{os.path.dirname(__file__)}/mojo/public/tools/bindings')
import mojo.public.tools.bindings.mojom_bindings_generator as generator
def _GetModulePath(path, output_dir):
- return os.path.join(output_dir, path.relative_path())
+ return os.path.join(output_dir, path.relative_path())
+
+
+# Disable the attribute checker to support our custom attributes. Ideally we
+# should add the attributes to the list of allowed attributes in
+# utils/ipc/mojo/public/tools/bindings/checks/mojom_attributes_check.py, but
+# we're trying hard to use the upstream mojom as-is.
+if hasattr(generator, '_BUILTIN_CHECKS'):
+ del generator._BUILTIN_CHECKS['attributes']
# Override the mojo code generator's generator list to only contain our
# libcamera generator