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

fix: Correct rpm-ostree issue that prevents rollbacks #635

Merged
merged 2 commits into from
Aug 28, 2024
Merged

Conversation

KyleGospo
Copy link
Member

Upstream issue: coreos/rpm-ostree#5048
Upstream MR: coreos/rpm-ostree#5069
Package source: https://github.com/ublue-os/packages/tree/main/staging/rpm-ostree

Also sneaks in a quick fix for some whitespace issues.

@dosubot dosubot bot added size:S This PR changes 10-29 lines, ignoring generated files. bug Something isn't working labels Aug 28, 2024
Copy link
Member

@p5 p5 left a comment

Choose a reason for hiding this comment

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

LGTM!

@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Aug 28, 2024
Copy link
Contributor

@bsherman bsherman left a comment

Choose a reason for hiding this comment

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

I looked at our rpm-ostree.spec file in https://github.com/ublue-os/packages/blob/main/staging/rpm-ostree/rpm-ostree.spec

It doesn't match upstream https://github.com/coreos/rpm-ostree/blob/main/packaging/rpm-ostree.spec

New requirements:

  • fuse3 package
  • usr/bin/setpriv

Dropped requirements:

  • libzstd-devel

Is this intended?

@KyleGospo
Copy link
Member Author

Is this intended?

Yes, it's copied from Fedora.
https://src.fedoraproject.org/rpms/rpm-ostree/tree/f40

@bsherman
Copy link
Contributor

Is this intended?

Yes, it's copied from Fedora. https://src.fedoraproject.org/rpms/rpm-ostree/tree/f40

Yep, I just went down that path, to see if that's where you pulled it. I agree, this spec matches.

Thanks!

Copy link
Contributor

@bsherman bsherman left a comment

Choose a reason for hiding this comment

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

This should be good.

@KyleGospo KyleGospo added this pull request to the merge queue Aug 28, 2024
Merged via the queue into main with commit 2a37660 Aug 28, 2024
19 checks passed
@KyleGospo KyleGospo deleted the ostree-fix branch August 28, 2024 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working lgtm This PR has been approved by a maintainer size:S This PR changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants