Summary: | Portage handles emulated USE flag renames in || any-of deps poorly (cannot install =sys-kernel/installkernel-systemd-2-r4) | ||
---|---|---|---|
Product: | Portage Development | Reporter: | Sam James <sam> |
Component: | Core - Dependencies | Assignee: | Portage team <dev-portage> |
Status: | CONFIRMED --- | ||
Severity: | normal | CC: | andrewammerlaan, esigra, systemd |
Priority: | Normal | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
See Also: |
https://bugs.gentoo.org/show_bug.cgi?id=814335 https://bugs.gentoo.org/show_bug.cgi?id=813099 https://github.com/gentoo/portage/pull/1180 https://bugs.gentoo.org/show_bug.cgi?id=919315 https://bugs.gentoo.org/show_bug.cgi?id=922772 https://bugs.gentoo.org/show_bug.cgi?id=922811 |
||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Bug Depends on: | |||
Bug Blocks: | 155723, 376695 |
Description
Sam James
2023-11-11 04:41:18 UTC
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba3e5e0f675dc5a1b7477eb73c7ea05d5b5c26b commit 4ba3e5e0f675dc5a1b7477eb73c7ea05d5b5c26b Author: Sam James <sam@gentoo.org> AuthorDate: 2023-11-11 04:42:26 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2023-11-11 04:43:55 +0000 sys-kernel/installkernel-systemd: drop attempt to emulate USE flag renames This ends up confusing Portage to an appalling level so we can't carry on with it, even though I liked the idea and tried it myself with the gnuefi->boot rename. (I'm not sure if that actually worked properly or if the third-order kernel-install "rename" bit tipped it over the edge?) Stable versions of systemd & systemd-utils have the new flags, so just simplify the || ( ... ) to systemd[kernel-install(-)] and systemd-boot[kernel-install(-)]. Bug: https://bugs.gentoo.org/917145 Signed-off-by: Sam James <sam@gentoo.org> .../installkernel-systemd-2-r5.ebuild | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) My assumption is that we currently do something like just discard the cpv entirely if we fail a use flag default dep, but not looked yet (In reply to Sam James from comment #2) > My assumption is that we currently do something like just discard the cpv > entirely if we fail a use flag default dep, but not looked yet It's more nuanced than that.. if we have IUSE="+gnuefi" and IUSE="+kernel-install", then we rightly prefer the newer systemd-254 w/ kernel-install over systemd-254 with gnuefi... Added a test case in https://github.com/gentoo/portage/pull/1180. I would think it would probably be fine at least in the stage3 if the old stuff was moved to the right, very much like flipping the libxcrypt/glibc order for bug 814335. The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1548f149879fca4915d49d3a1991d9d2ebd03e57 commit 1548f149879fca4915d49d3a1991d9d2ebd03e57 Author: Andrew Ammerlaan <andrewammerlaan@gentoo.org> AuthorDate: 2024-01-12 11:22:40 +0000 Commit: Andrew Ammerlaan <andrewammerlaan@gentoo.org> CommitDate: 2024-01-12 11:24:52 +0000 */*: move sys-kernel/installkernel-gentoo to sys-kernel/installkernel Bug: https://bugs.gentoo.org/917145 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org> eclass/kernel-install.eclass | 8 ++++---- profiles/updates/1Q-2024 | 1 + sys-apps/debianutils/debianutils-5.14.ebuild | 4 ++-- sys-kernel/installkernel-gentoo/Manifest | 2 -- .../installkernel-systemd/installkernel-systemd-2-r4.ebuild | 4 ++-- .../installkernel-systemd/installkernel-systemd-2-r5.ebuild | 4 ++-- sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild | 4 ++-- sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild | 6 +++--- sys-kernel/installkernel/Manifest | 2 ++ .../installkernel-12.ebuild} | 0 .../installkernel-14.ebuild} | 0 sys-kernel/{installkernel-gentoo => installkernel}/metadata.xml | 0 12 files changed, 18 insertions(+), 17 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0e18bea2ae37ba19d0720867ebca5836f105c1 commit 4c0e18bea2ae37ba19d0720867ebca5836f105c1 Author: Andrew Ammerlaan <andrewammerlaan@gentoo.org> AuthorDate: 2024-01-12 11:11:09 +0000 Commit: Andrew Ammerlaan <andrewammerlaan@gentoo.org> CommitDate: 2024-01-12 11:24:51 +0000 sys-kernel/installkernel-systemd: add 4 4 is just a wrapper that depends on installkernel-gentoo. This wrapper allows us to keep these changes in unstable for now, while retaining the "split" behaviour on stable. Bug: https://bugs.gentoo.org/917145 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org> sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285bb764b6339b94621f68b7495a72a8235b0036 commit 285bb764b6339b94621f68b7495a72a8235b0036 Author: Andrew Ammerlaan <andrewammerlaan@gentoo.org> AuthorDate: 2024-01-12 11:10:42 +0000 Commit: Andrew Ammerlaan <andrewammerlaan@gentoo.org> CommitDate: 2024-01-12 11:24:50 +0000 sys-kernel/installkernel-systemd: add 4 Bug: https://bugs.gentoo.org/917145 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org> .../installkernel-systemd-4.ebuild | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdd56b68122666ee19d8e9a755474b696a88fc23 commit bdd56b68122666ee19d8e9a755474b696a88fc23 Author: Andrew Ammerlaan <andrewammerlaan@gentoo.org> AuthorDate: 2024-01-12 11:03:30 +0000 Commit: Andrew Ammerlaan <andrewammerlaan@gentoo.org> CommitDate: 2024-01-12 11:24:49 +0000 sys-kernel/installkernel-gentoo: add 14 Changelog: - added grub-mkconfig plugin for systemd's kernel-install - call systemd's kernel-install if it is installed, this can be controlled with the SYSTEMD_KERNEL_INSTALL env var, whose default is set by the ebuild depending on USE=systemd - imported plugins from installkernel-systemd - clarified warning messages when dracut/ukify is not installed - set some default install.conf based on the flags we already have for the "legacy" install anyway. Use /etc/ instead of /usr/lib because systemd already installs a dummy file to /usr/lib and we would have a file conflict with this. Bug: https://bugs.gentoo.org/917145 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org> sys-kernel/installkernel-gentoo/Manifest | 1 + .../installkernel-gentoo-14.ebuild | 85 ++++++++++++++++++++++ sys-kernel/installkernel-gentoo/metadata.xml | 1 + 3 files changed, 87 insertions(+) The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd777824a5523f812a7fd267ae474320be536411 commit dd777824a5523f812a7fd267ae474320be536411 Author: Andrew Ammerlaan <andrewammerlaan@gentoo.org> AuthorDate: 2024-01-24 14:38:26 +0000 Commit: Andrew Ammerlaan <andrewammerlaan@gentoo.org> CommitDate: 2024-01-24 14:38:26 +0000 sys-kernel/installkernel: drop default +dracut This is now possible due to the last-rites of installkernel-systemd Closes: https://bugs.gentoo.org/922772 Bug: https://bugs.gentoo.org/917145 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org> sys-kernel/installkernel/installkernel-12.ebuild | 2 +- sys-kernel/installkernel/installkernel-15-r1.ebuild | 2 +- sys-kernel/installkernel/installkernel-17.ebuild | 2 +- sys-kernel/installkernel/installkernel-18.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) |