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

Handle conflicts between newer glibc and kernel headers #2686

Merged
merged 2 commits into from Aug 4, 2022

Conversation

cgwalters
Copy link
Member

Remove unused linux/fs.h includes

Prep for fixing conflicts introduced by newer glibc.
cc #2685


Move FIFREEZE/FITHAW ioctl invocations into linuxfsutil.c

Should help avoid conflicts between glibc and linux headers.

Closes: #2685


Prep for fixing conflicts introduced by newer glibc.
cc ostreedev#2685
Should help avoid conflicts between glibc and linux headers.

Closes: ostreedev#2685
@lucab
Copy link
Member

lucab commented Aug 3, 2022

LGTM, pending confirmation from reporter as our CI does not yet cover this.

@GeorgesStavracas
Copy link
Contributor

Can confirm it builds and the resulting ostree works as expected

@cgwalters
Copy link
Member Author

/override continuous-integration/jenkins/pr-merge
not related to this

@openshift-ci
Copy link

openshift-ci bot commented Aug 3, 2022

@cgwalters: Overrode contexts on behalf of cgwalters: continuous-integration/jenkins/pr-merge

In response to this:

/override continuous-integration/jenkins/pr-merge
not related to this

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@lucab lucab enabled auto-merge August 4, 2022 07:01
@lucab lucab merged commit e424efa into ostreedev:main Aug 4, 2022
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.

Build failure with conflicting enum types with glibc >= 2.36
3 participants