commit: 4ba3e5e0f675dc5a1b7477eb73c7ea05d5b5c26b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Nov 11 04:42:26 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Nov 11 04:43:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba3e5e0
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 <AT> gentoo.org> .../installkernel-systemd-2-r5.ebuild | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild new file mode 100644 index 000000000000..bf7bd29ba0a5 --- /dev/null +++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild @@ -0,0 +1,34 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Wrap kernel-install from systemd as installkernel" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"; +S="${WORKDIR}" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="amd64 arm64 ~loong ppc64 x86" + +RDEPEND=" + !sys-kernel/installkernel-gentoo + || ( + sys-apps/systemd[kernel-install(-)] + sys-apps/systemd-utils[kernel-install(-)] + ) +" + +src_install() { + # we could technically use a symlink here but it would require + # us to know the correct path, and that implies /usr merge problems + into / + newsbin - installkernel <<-EOF + #!/usr/bin/env sh + exec kernel-install add "\${1}" "\${2}" --verbose + EOF + + exeinto /usr/lib/kernel/install.d/ + newexe "${FILESDIR}/${PN}-2-r2-00-00machineid-directory.install" \ + 00-00machineid-directory.install +}
