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

Packit: fix build issues #238

Merged
merged 1 commit into from
May 11, 2023
Merged

Packit: fix build issues #238

merged 1 commit into from
May 11, 2023

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented May 10, 2023

A prior merge of 5802ca2
undid some changes for the install.selinux-user target in rpm/spec.
This commit also fixes that.

@lsm5
Copy link
Member Author

lsm5 commented May 10, 2023

Let me make sure that things work when the version is changed. The Source0 was one thing that needed fixing.

@lsm5
Copy link
Member Author

lsm5 commented May 10, 2023

@rhatdan ok we're past the packit config errors, the rpm build fails at:

container.te:1469:ERROR 'permission watch is not defined for class file' at token ';' on line 70562:
allow container_domain fusefs_t:file { append create entrypoint execmod execute execute_no_trans getattr ioctl link lock map mounton open read rename setattr unlink watch watch_reads write };
allow container_domain container_var_lib_t:file entrypoint;
container.te:1469:ERROR 'permission watch_reads is not defined for class file' at token ';' on line 70562:
allow container_domain fusefs_t:file { append create entrypoint execmod execute execute_no_trans getattr ioctl link lock map mounton open read rename setattr unlink watch watch_reads write };
allow container_domain container_var_lib_t:file entrypoint;
/usr/bin/checkmodule:  error(s) encountered while parsing configuration
make[1]: Leaving directory '/builddir/build/BUILD/container-selinux-2.212.0'
make[1]: *** [/usr/share/selinux/devel/include/Makefile:157: tmp/container.mod] Error 1
make: *** [Makefile:16: container.pp] Error 2

EDIT: This seems to be centos 9 only.

@rhatdan
Copy link
Member

rhatdan commented May 10, 2023

Yup this is a case where watch is not available for older selinux-policies.
Need to sed them out.

@rhatdan
Copy link
Member

rhatdan commented May 10, 2023

watch and watch_reads.

@lsm5
Copy link
Member Author

lsm5 commented May 10, 2023

will do ..

@lsm5 lsm5 force-pushed the packit-fix branch 4 times, most recently from 6ac17df to fdf8b2a Compare May 10, 2023 17:25
@lsm5
Copy link
Member Author

lsm5 commented May 10, 2023

i merged a commit for ghosting /var/lib/* which undid the spec file selinux-user changes. Adding them back again here.

@lsm5 lsm5 force-pushed the packit-fix branch 2 times, most recently from 2507734 to c417ba0 Compare May 10, 2023 17:41
@lsm5 lsm5 marked this pull request as ready for review May 10, 2023 17:48
@lsm5 lsm5 changed the title Packit: fix Source tarball field in .packit.sh Packit: fix build issues May 10, 2023
@lsm5 lsm5 requested a review from rhatdan May 10, 2023 17:50
@lsm5
Copy link
Member Author

lsm5 commented May 10, 2023

@rhatdan would be good to cut a new release after this and verify that fedora downstream process works as expected with packit.

@lsm5
Copy link
Member Author

lsm5 commented May 10, 2023

whoops tests failed. looking ..

@lsm5
Copy link
Member Author

lsm5 commented May 10, 2023

@rhatdan podman selinux system tests need to be updated.

@lsm5
Copy link
Member Author

lsm5 commented May 10, 2023

The system tests are run against the podman built from main branch, so it would be ideal to fix podman upstream, then have the tests succeed here before merge.

EDIT: We should get that change cherry-picked to the v4.5 upstream branch and all other branches that would require the new container-selinux.

A prior merge of 5802ca2
undid some changes for the `install.selinux-user` target in rpm/spec.
This commit also fixes that.

Signed-off-by: Lokesh Mandvekar <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented May 11, 2023

Might need containers/podman#18439 for the tests to pass. If these are the only breakage, then I think we should merge and cut a new release.

@lsm5
Copy link
Member Author

lsm5 commented May 11, 2023

let's merge after the build tests pass.

@lsm5 lsm5 merged commit d984ce3 into containers:main May 11, 2023
@lsm5 lsm5 deleted the packit-fix branch May 11, 2023 15:19
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