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

Second attempt at supporting dnf5 for the ISO build #172

Merged
merged 3 commits into from
Jan 10, 2025

Conversation

marmarek
Copy link
Member

@marmarek marmarek commented Jan 4, 2025

No description provided.

dnf5 download doesn't handle groups yet:
rpm-software-management/dnf5#1129

This reverts commit 9292d2c.
@marmarek marmarek force-pushed the devel20250104 branch 4 times, most recently from f75e8ac to 225f20e Compare January 4, 2025 03:37
Copy link

codecov bot commented Jan 4, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.25%. Comparing base (9292d2c) to head (05b7bc1).
Report is 18 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #172   +/-   ##
=======================================
  Coverage   78.25%   78.25%           
=======================================
  Files          47       47           
  Lines        5400     5400           
=======================================
  Hits         4226     4226           
  Misses       1174     1174           

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

@marmarek
Copy link
Member Author

marmarek commented Jan 4, 2025

CI failed due to rpm-software-management/dnf5#1985 ...

@marmarek
Copy link
Member Author

marmarek commented Jan 6, 2025

I'm going to drop this commit:

dnf5 doesn't support --downloaddir (nor --destdir) for the install
action yet. Previous attempt of the fix was using download action, but
that on the other hand doesn't support groups. This time fix this by
extracting packages from dnf cache manually. Use find to not rely on
specific directory layout (which is not guaranteed to stay unchanged).

Additionally adjust options order for dnf5 (action options after
action).

This skips packages in local repositories (baseurl=file://...), which includes templates cache and locally built packages. Since a latter commit fallback to the old DNF anyway, there is no need for other parts of this commit anyway. But it will become necessary in the future, in the next attempt to switch to DNF5.

dnf5 install --downloadonly does not verifies signatures, so use the old
one for the time being.

Workaround for rpm-software-management/dnf5#1985
When $GPGHOME is set to $HOME/.gnupg, gpg will use default gpg-agent
socket path ($XDG_RUNTIME_DIR/gnupg/S.gpg-agent). If there is gpg-agent
for the original home already running, it will get used, instead of the
one for modified $HOME/$GNUPGHOME. Fix this by setting $GNUPGHOME to a
slightly modified dir, so it doesn't fall into the default case.
@marmarek marmarek merged commit 36bd715 into QubesOS:main Jan 10, 2025
4 checks passed
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.

1 participant