public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/scx/
Date: Mon, 10 Mar 2025 00:22:58 +0000 (UTC)	[thread overview]
Message-ID: <1741566018.652d83794e35eb13dca121276c40d004f73da156.sam@gentoo> (raw)

commit:     652d83794e35eb13dca121276c40d004f73da156
Author:     Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Sun Mar  9 16:14:42 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 00:20:18 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=652d8379

sys-kernel/scx: manually install openrc init.d script

Upstream's build system checks for openrc as a dependency before
installing the init.d script. This is not actually necessary, since
installing it on a non-openrc system is perfectly fine. Previously, scx
had an openrc use flag that toggled the openrc feature in meson. This
was not ideal since this is not a standardized use flag and openrc users
would have to manually enable it. Instead, disable the openrc meson
feature and install the init.d script manually in src_install.

Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-kernel/scx/scx-1.0.10.ebuild | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sys-kernel/scx/scx-1.0.10.ebuild b/sys-kernel/scx/scx-1.0.10.ebuild
index 060fd1551ffb..90ec0e6d00f8 100644
--- a/sys-kernel/scx/scx-1.0.10.ebuild
+++ b/sys-kernel/scx/scx-1.0.10.ebuild
@@ -34,13 +34,12 @@ LICENSE+="
 "
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="openrc systemd"
+IUSE="systemd"
 
 DEPEND="
 	virtual/libelf:=
 	sys-libs/zlib:=
 	>=dev-libs/libbpf-1.5:=
-	openrc? ( sys-apps/openrc )
 "
 RDEPEND="
 	${DEPEND}
@@ -95,7 +94,7 @@ src_configure() {
 		-Doffline=true
 		-Denable_rust=true
 		-Dlibalpm=disabled
-		$(meson_feature openrc)
+		-Dopenrc=disabled
 		$(meson_feature systemd)
 	)
 
@@ -123,4 +122,9 @@ src_install() {
 		readme_name="${readme_name%/README.md}"
 		newdoc "${readme}" "${readme_name}.md"
 	done
+
+	newinitd services/openrc/scx.initrd scx
+	insinto /etc/default
+	doins services/scx
+	dosym ../default/scx /etc/conf.d/scx
 }


             reply	other threads:[~2025-03-10  0:23 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-10  0:22 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-04-10 22:26 [gentoo-commits] repo/gentoo:master commit in: sys-kernel/scx/ Sam James
2025-04-10 22:26 Sam James
2025-04-10 22:26 Sam James
2025-04-02 12:46 Florian Schmaus
2025-03-10  0:22 Sam James
2025-03-10  0:22 Sam James
2025-03-10  0:22 Sam James
2025-02-13 21:01 Arthur Zamarin
2025-01-18 10:52 Florian Schmaus
2025-01-08  9:02 Florian Schmaus
2025-01-08  9:02 Florian Schmaus
2024-12-19 10:41 Florian Schmaus
2024-12-19 10:41 Florian Schmaus
2024-12-17 17:24 Patrick McLean
2024-11-26 16:50 Florian Schmaus
2024-11-26 16:32 Florian Schmaus
2024-11-08  7:50 Florian Schmaus
2024-10-12 10:32 Florian Schmaus
2024-10-12 10:32 Florian Schmaus
2024-10-11 18:00 Florian Schmaus

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=1741566018.652d83794e35eb13dca121276c40d004f73da156.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