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

Add cleanup_32bit.py tool #2983

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Conversation

Vogtinator
Copy link
Member

This uses code from cleanup_rings to figure out which packages are needed
for a 32bit build and runtime environment for steam and wine.

Draft because the API in cleanup_rings had to be changed and that broke cleanup_rings.

@Vogtinator Vogtinator requested a review from DimStar77 July 3, 2023 14:49
@codecov-commenter
Copy link

codecov-commenter commented Jul 3, 2023

Codecov Report

Attention: Patch coverage is 0% with 111 lines in your changes missing coverage. Please review.

Please upload report for BASE (master@44bcd82). Learn more about missing BASE report.
Report is 311 commits behind head on master.

Files with missing lines Patch % Lines
osclib/cleanup_rings.py 0.00% 63 Missing ⚠️
cleanup_32bit.py 0.00% 48 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff            @@
##             master    #2983   +/-   ##
=========================================
  Coverage          ?   28.87%           
=========================================
  Files             ?       85           
  Lines             ?    14516           
  Branches          ?        0           
=========================================
  Hits              ?     4191           
  Misses            ?    10325           
  Partials          ?        0           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

cleanup_32bit.py Outdated
def run(self, prj: str, arch: str):
Config(self.apiurl, prj)
cr = CleanupRings(StagingAPI(self.apiurl, prj))
cr.whitelist = set(["wine", "wine-nine-standalone", "wine:staging"])
Copy link
Member

@dirkmueller dirkmueller Jul 4, 2023

Choose a reason for hiding this comment

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

Needed or requiredset perhaps? whitelist is pretty generic ( and non inclusive) terminology . And it's not a list but a set..

Copy link
Member Author

Choose a reason for hiding this comment

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

It's actually a list in CleanupRings still, can be changed in a later refactor commit after I got this one working

Copy link
Member Author

Choose a reason for hiding this comment

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

It's a dict now with more info, renamed to force_required

cleanup_32bit.py Outdated
for providedby in fileinfo.findall('requires_ext/providedby[@name]'):
name = providedby.get('name')
# Those are not built as i586
if "libgcc" in name or "libstdc++" in name:
Copy link
Member

Choose a reason for hiding this comment

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

Maybe 'startswith'?

Copy link
Member Author

Choose a reason for hiding this comment

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

Changed

Only used for the old Leap setup.

The concept would still work for TW, but baselibs.conf is not enough of an
indication (anymore?) whether it needs to be built.
This uses code from cleanup_rings to figure out which packages are needed
for a 32bit build and runtime environment for steam and wine.
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.

3 participants