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

Set gpkg as BINPKG_FORMAT default #1102

Closed
wants to merge 2 commits into from

Conversation

akhuettel
Copy link
Member

Untested so far, but pretty straightforward given existing mechanisms

@thesamesam
Copy link
Member

Did you have a chance to test this yet?

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
@akhuettel
Copy link
Member Author

Needed an entry in meson.build, but otherwise works now as intended. Here's the required patch for portage-9999.ebuild :

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 5bf30b190b87e..abf843edb7357 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -205,6 +205,10 @@ pkg_preinst() {
                env -u FEATURES -u PORTAGE_REPOSITORIES \
                        PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
                        "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+
+               env -u BINPKG_FORMAT \
+                       PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+                       "${PYTHON}" -m portage._compat_upgrade.binpkg_format || die
        fi
 
        # elog dir must exist to avoid logrotate error for bug #415911.

@akhuettel
Copy link
Member Author

akhuettel commented Nov 5, 2023

Just as a remark, this has, ahem, interesting side effects if binpkg-request-signature is enabled but local binpackage signing is not set up. You suddenly can't generate any binary packages locally anymore! (Trying to do so results in a backtrace and invalid files in the package directory.)

@thesamesam
Copy link
Member

thesamesam commented Nov 11, 2023

Just as a remark, this has, ahem, interesting side effects if binpkg-request-signature is enabled but local binpackage signing is not set up. You suddenly can't generate any binary packages locally anymore! (Trying to do so results in a backtrace and invalid files in the package directory.)

I think this was always a problem if you set binpkg-request-signature -- i.e. it's not new to the default change, it just makes it more prominent? Or am I misunderstanding?

EDIT: Ah, I guess it may be a new issue for people if they had it set and were using remote stuff relying on a binhost but never set the default locally as you don't need the local BINPKG_FORMAT to match. Duh.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants