Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkcs11-json: Make regeneration robuster #594

Merged
merged 1 commit into from
Oct 26, 2023

Conversation

ueno
Copy link
Member

@ueno ueno commented Oct 26, 2023

Previously, when common/pkcs11.h is updated and castxml is not installed on the system, an empty pkcs11.json is created. This makes the build process abort in that case.

This also fixes the path of pkcs11.json referred to by p11-kit/Makefile.am, and only includes necessary files in the distribution.

Previously, when common/pkcs11.h is updated and castxml is not
installed on the system, an empty pkcs11.json is created.  This makes
the build process abort in that case.

This also fixes the path of pkcs11.json referred to by
p11-kit/Makefile.am, and only includes necessary files in the
distribution.

Signed-off-by: Daiki Ueno <[email protected]>
Copy link
Contributor

@ZoltanFridrich ZoltanFridrich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ueno ueno merged commit 8e21f76 into p11-glue:master Oct 26, 2023
14 checks passed
@ZoltanFridrich ZoltanFridrich added this to the 0.25.2 milestone Oct 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants