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

Various cleanups #6

Merged
merged 2 commits into from Mar 26, 2024
Merged

Various cleanups #6

merged 2 commits into from Mar 26, 2024

Conversation

Thaodan
Copy link
Contributor

@Thaodan Thaodan commented Jan 8, 2024

  • Remove our copy of %make_install
  • packages we use make should use %qmake5_install instead of %make_install
  • Remove configuration to use XZ compression => we switched to ZSTD in JB#56416

macros Show resolved Hide resolved
@pvuorela
Copy link

Needs a rebase

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
@Thaodan Thaodan requested a review from pvuorela January 23, 2024 13:16
Thaodan added a commit to sailfishos/qtwayland that referenced this pull request Jan 23, 2024
Previously these were packaged although they were not used.
Rpm will take care of cleaning those up for us:
rpm-software-management/rpm@e0de325

Reference: sailfishos/rpm#14, sailfishos/meego-rpm-config#6
Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
@pvuorela
Copy link

pvuorela commented Jan 29, 2024

I'm not following the removal of the zstd compression. Commit says "Don't override compression method. We switched to zstd." but it's the zstd here that gets removed? Unless there's a a second declaration added somewhere.

The declaration was done elsewhere, in the rpm package. that's why the removal.

The .la file removal commit doesn't explicitly say it, but guess that's now done on upstream rpm. Thus should be fine.

Yes as mentioned in the commit message.

@pvuorela
Copy link

I'm not following the removal of the zstd compression. Commit says "Don't override compression method. We switched to zstd." but it's the zstd here that gets removed? Unless there's a a second declaration added somewhere.

The declaration was done elsewhere, in the rpm package. that's why the removal.

Heh. Looks like you modified my message instead of replying. Didn't immediately notice such feedback.

But I'm not spotting the rpm declaration so care to help me out? What I see now is
/usr/lib/rpm/macros having payload configs commented out, but saying gzip level 9 is the default.

Reference: sailfishos/rpm#14
Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
@Thaodan
Copy link
Contributor Author

Thaodan commented Feb 22, 2024 via email

Thaodan added a commit that referenced this pull request Mar 26, 2024
@Thaodan Thaodan merged commit daf7b40 into master Mar 26, 2024
@mlehtima mlehtima deleted the jb55344_make_install branch April 22, 2024 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants