From d99baa458170ac98f4626813c026d020e65b62f1 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 1 Apr 2016 10:28:21 -0400 Subject: [PATCH] sys-apps/systemd: Hard-code KILL=/bin/kill When building stage3, systemd may be built before kill is installed. We only need to know its path, so just hard-code it in the ebuild. Package-Manager: portage-2.2.28_p64 --- sys-apps/systemd/systemd-226-r2.ebuild | 3 ++- sys-apps/systemd/systemd-228-r1.ebuild | 3 ++- sys-apps/systemd/systemd-229-r100.ebuild | 1 + sys-apps/systemd/systemd-229.ebuild | 1 + sys-apps/systemd/systemd-9999.ebuild | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys-apps/systemd/systemd-226-r2.ebuild b/sys-apps/systemd/systemd-226-r2.ebuild index 78438536aa45..686ebc653045 100644 --- a/sys-apps/systemd/systemd-226-r2.ebuild +++ b/sys-apps/systemd/systemd-226-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -224,6 +224,7 @@ multilib_src_configure() { $(multilib_native_use_enable xkb xkbcommon) # hardcode a few paths to spare some deps + KILL=/bin/kill QUOTAON=/usr/sbin/quotaon QUOTACHECK=/usr/sbin/quotacheck diff --git a/sys-apps/systemd/systemd-228-r1.ebuild b/sys-apps/systemd/systemd-228-r1.ebuild index a6448c154664..7444bfd1224e 100644 --- a/sys-apps/systemd/systemd-228-r1.ebuild +++ b/sys-apps/systemd/systemd-228-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -228,6 +228,7 @@ multilib_src_configure() { $(multilib_native_use_enable xkb xkbcommon) # hardcode a few paths to spare some deps + KILL=/bin/kill QUOTAON=/usr/sbin/quotaon QUOTACHECK=/usr/sbin/quotacheck diff --git a/sys-apps/systemd/systemd-229-r100.ebuild b/sys-apps/systemd/systemd-229-r100.ebuild index 6396d2f9162a..0a7cf4deb07d 100644 --- a/sys-apps/systemd/systemd-229-r100.ebuild +++ b/sys-apps/systemd/systemd-229-r100.ebuild @@ -237,6 +237,7 @@ multilib_src_configure() { $(multilib_native_use_enable xkb xkbcommon) # hardcode a few paths to spare some deps + KILL=/bin/kill QUOTAON=/usr/sbin/quotaon QUOTACHECK=/usr/sbin/quotacheck diff --git a/sys-apps/systemd/systemd-229.ebuild b/sys-apps/systemd/systemd-229.ebuild index cabf9872c1a3..70ec90f8afc7 100644 --- a/sys-apps/systemd/systemd-229.ebuild +++ b/sys-apps/systemd/systemd-229.ebuild @@ -237,6 +237,7 @@ multilib_src_configure() { $(multilib_native_use_enable xkb xkbcommon) # hardcode a few paths to spare some deps + KILL=/bin/kill QUOTAON=/usr/sbin/quotaon QUOTACHECK=/usr/sbin/quotacheck diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index cc5d672bc09c..e91c6da3b7fb 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -236,6 +236,7 @@ multilib_src_configure() { $(multilib_native_use_enable xkb xkbcommon) # hardcode a few paths to spare some deps + KILL=/bin/kill QUOTAON=/usr/sbin/quotaon QUOTACHECK=/usr/sbin/quotacheck -- 2.26.2