From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd/
Date: Sat, 11 Nov 2023 04:44:03 +0000 (UTC) [thread overview]
Message-ID: <1699677835.4ba3e5e0f675dc5a1b7477eb73c7ea05d5b5c26b.sam@gentoo> (raw)
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
+}
next reply other threads:[~2023-11-11 4:44 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-11 4:44 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-24 14:35 [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd/ Andrew Ammerlaan
2024-01-24 13:37 Sam James
2024-01-24 10:59 Sam James
2024-01-24 10:58 Sam James
2024-01-22 13:55 Andrew Ammerlaan
2024-01-22 13:55 Andrew Ammerlaan
2024-01-13 6:49 Andrew Ammerlaan
2024-01-12 20:32 Andrew Ammerlaan
2024-01-12 11:25 Andrew Ammerlaan
2024-01-12 11:25 Andrew Ammerlaan
2023-12-21 0:07 Ionen Wolkens
2023-12-08 12:54 Arthur Zamarin
2023-12-05 13:15 Andrew Ammerlaan
2023-12-02 9:24 Arthur Zamarin
2023-11-27 14:21 Jakov Smolić
2023-11-18 14:54 Sam James
2023-11-18 14:49 Sam James
2023-11-09 8:42 Andrew Ammerlaan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1699677835.4ba3e5e0f675dc5a1b7477eb73c7ea05d5b5c26b.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox