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 3BE6715800A for ; Sun, 18 Jun 2023 12:56:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66A2AE087C; Sun, 18 Jun 2023 12:56:52 +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 47434E087C for ; Sun, 18 Jun 2023 12:56:52 +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 4587734085A for ; Sun, 18 Jun 2023 12:56:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A2D5BA91 for ; Sun, 18 Jun 2023 12:56:49 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1687093006.9610d99869f591742d96e180e987a95d23b31a0b.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/libvirt-9.4.0.ebuild app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 9610d99869f591742d96e180e987a95d23b31a0b X-VCS-Branch: master Date: Sun, 18 Jun 2023 12:56:49 +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: 31136820-907d-49af-81d7-bd446790cfb5 X-Archives-Hash: 2ed44653f161f6700d417ace18b3d4d9 commit: 9610d99869f591742d96e180e987a95d23b31a0b Author: Michal Privoznik gmail com> AuthorDate: Sun Jun 18 08:27:13 2023 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sun Jun 18 12:56:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9610d998 app-emulation/libvirt: Fix EnvironmentFile= in systemd units Libvirt installs systemd unit files with EnvironmentFile= derived from initconfdir option passed in the configure phase, e.g.: src/ch/virtchd.service.in:21:EnvironmentFile=-@initconfdir@/virtchd And since we explicitly pass: -Dinitconfdir="${EPREFIX}/etc/conf.d" this results in systemd unit files using /etc/conf.d/ which is discouraged. Closes: https://bugs.gentoo.org/908750 Signed-off-by: Michal Privoznik gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31526 Signed-off-by: Joonas Niilola gentoo.org> app-emulation/libvirt/libvirt-9.4.0.ebuild | 2 +- app-emulation/libvirt/libvirt-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-emulation/libvirt/libvirt-9.4.0.ebuild b/app-emulation/libvirt/libvirt-9.4.0.ebuild index 194bcf790db6..6c17559eba62 100644 --- a/app-emulation/libvirt/libvirt-9.4.0.ebuild +++ b/app-emulation/libvirt/libvirt-9.4.0.ebuild @@ -303,7 +303,7 @@ src_configure() { -Ddriver_vmware=enabled --localstatedir="${EPREFIX}/var" - -Dinitconfdir="${EPREFIX}/etc/conf.d" + -Dinitconfdir="${EPREFIX}/etc/systemd" -Drunstatedir="${EPREFIX}/run" -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" ) diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 1976124be9e6..cc80f16e8bc8 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -302,7 +302,7 @@ src_configure() { -Ddriver_vmware=enabled --localstatedir="${EPREFIX}/var" - -Dinitconfdir="${EPREFIX}/etc/conf.d" + -Dinitconfdir="${EPREFIX}/etc/systemd" -Drunstatedir="${EPREFIX}/run" -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" )