From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8B6DF158089 for ; Sat, 11 Nov 2023 04:44:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF74F2BC019; Sat, 11 Nov 2023 04:44:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEEBE2BC019 for ; Sat, 11 Nov 2023 04:44:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1E96335D77 for ; Sat, 11 Nov 2023 04:44:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8EBA1351 for ; Sat, 11 Nov 2023 04:44:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1699677835.4ba3e5e0f675dc5a1b7477eb73c7ea05d5b5c26b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild X-VCS-Directories: sys-kernel/installkernel-systemd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4ba3e5e0f675dc5a1b7477eb73c7ea05d5b5c26b X-VCS-Branch: master Date: Sat, 11 Nov 2023 04:44:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 48cc9f78-8d72-42ac-8c1f-d210eb43a36a X-Archives-Hash: 50c0aee5c4cdf3daa417ce6715523c4e commit: 4ba3e5e0f675dc5a1b7477eb73c7ea05d5b5c26b Author: Sam James gentoo org> AuthorDate: Sat Nov 11 04:42:26 2023 +0000 Commit: Sam James gentoo 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 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 +}