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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 23B96139694 for ; Mon, 29 May 2017 17:28:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D524E0DC8; Mon, 29 May 2017 17:28:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F7C6E0DC8 for ; Mon, 29 May 2017 17:28:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 21C8E3416EB for ; Mon, 29 May 2017 17:28:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 862557455 for ; Mon, 29 May 2017 17:28:44 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1496078922.268c6a2f07b64c01a1314f740050cc2cd1e5c8f6.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/dracut/dracut-044-r2.ebuild sys-kernel/dracut/dracut-044-r3.ebuild X-VCS-Directories: sys-kernel/dracut/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 268c6a2f07b64c01a1314f740050cc2cd1e5c8f6 X-VCS-Branch: master Date: Mon, 29 May 2017 17:28:44 +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-Archives-Salt: 7156e122-fcac-4012-8d6c-c4e341eff365 X-Archives-Hash: 4b4e1a0c94834abad602f23de7761ff3 commit: 268c6a2f07b64c01a1314f740050cc2cd1e5c8f6 Author: Mike Gilbert gentoo org> AuthorDate: Wed May 3 19:32:32 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon May 29 17:28:42 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=268c6a2f sys-kernel/dracut: use pkg-config at runtime for systemd sys-apps/systemd may be moving from /usr/lib/systemd to /lib/systemd in a future release. dracut will automatically call pkg-config at run time if these paths are not in the config file. Package-Manager: Portage-2.3.5_p31, Repoman-2.3.2_p61 .../{dracut-044-r2.ebuild => dracut-044-r3.ebuild} | 23 +++++----------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/sys-kernel/dracut/dracut-044-r2.ebuild b/sys-kernel/dracut/dracut-044-r3.ebuild similarity index 88% rename from sys-kernel/dracut/dracut-044-r2.ebuild rename to sys-kernel/dracut/dracut-044-r3.ebuild index 89b9eaf1e9e..2af888711a7 100644 --- a/sys-kernel/dracut/dracut-044-r2.ebuild +++ b/sys-kernel/dracut/dracut-044-r3.ebuild @@ -16,7 +16,10 @@ IUSE="debug selinux systemd" RESTRICT="test" CDEPEND="virtual/udev - systemd? ( >=sys-apps/systemd-199 ) + systemd? ( + >=sys-apps/systemd-199 + virtual/pkgconfig + ) " RDEPEND="${CDEPEND} app-arch/cpio @@ -95,23 +98,7 @@ src_prepare() { sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \ -i "${S}/dracut.conf.d/gentoo.conf.example" || die - if use systemd; then - local systemdutildir="$(systemd_get_utildir)" - local systemdsystemunitdir="$(systemd_get_systemunitdir)" - local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \ - --variable=systemdsystemconfdir)" - [[ ${systemdsystemconfdir} ]] \ - || systemdsystemconfdir=/etc/systemd/system - einfo "Setting systemdutildir to ${systemdutildir} and ..." - sed -e "5asystemdutildir=\"${systemdutildir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..." - sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..." - sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - else + if ! use systemd; then local systemdutildir="/lib/systemd" einfo "Setting systemdutildir for standalone udev to" \ "${systemdutildir}..."