From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-947354-garchives=archives.gentoo.org@lists.gentoo.org>
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 8CE50139695
for <garchives@archives.gentoo.org>; Tue, 2 May 2017 09:01:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A2D19E0D1A;
Tue, 2 May 2017 09:01:42 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 7AB9FE0D1A
for <gentoo-commits@lists.gentoo.org>; Tue, 2 May 2017 09:01:42 +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 47C383416A9
for <gentoo-commits@lists.gentoo.org>; Tue, 2 May 2017 09:01:41 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A5636744C
for <gentoo-commits@lists.gentoo.org>; Tue, 2 May 2017 09:01:39 +0000 (UTC)
From: "Yixun Lan" <dlan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" <dlan@gentoo.org>
Message-ID: <1493715697.19210f286efe1cfbc6fd71bbe06782b61f8ffa14.dlan@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/xen-tools/xen-tools-4.8.1.ebuild
X-VCS-Directories: app-emulation/xen-tools/
X-VCS-Committer: dlan
X-VCS-Committer-Name: Yixun Lan
X-VCS-Revision: 19210f286efe1cfbc6fd71bbe06782b61f8ffa14
X-VCS-Branch: master
Date: Tue, 2 May 2017 09:01:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 07edaaba-aef5-44d5-bc61-c8a3671767a8
X-Archives-Hash: 1ef5a4c41ea811e884ef68b0e3405257
commit: 19210f286efe1cfbc6fd71bbe06782b61f8ffa14
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue May 2 08:27:58 2017 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue May 2 09:01:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19210f28
app-emulation/xen-tools: fix localstatedir path
The systemd /usr/lib64/systemd/system/var-lib-xenstored.mount file contains the line:
Where=/var/lib/lib/xenstored
This will trigger the systemd error message in the journal:
var-lib-xenstored.mount: Where= setting doesn't match unit name. Refusing.
Gentoo-Bug: 572304
Package-Manager: Portage-2.3.5, Repoman-2.3.2
app-emulation/xen-tools/xen-tools-4.8.1.ebuild | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/app-emulation/xen-tools/xen-tools-4.8.1.ebuild b/app-emulation/xen-tools/xen-tools-4.8.1.ebuild
index 97abadec279..b0b687340db 100644
--- a/app-emulation/xen-tools/xen-tools-4.8.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.8.1.ebuild
@@ -316,13 +316,6 @@ src_prepare() {
sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
fi
- # use /var instead of /var/lib, consistat with previous ebuild
- sed -i -e "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
- m4/paths.m4 configure tools/configure || die
- # use /run instead of /var/run
- sed -i -e "/XEN_RUN_DIR=/s/\$localstatedir//g" \
- m4/paths.m4 configure tools/configure || die
-
# uncomment lines in xl.conf
sed -e 's:^#autoballoon=:autoballoon=:' \
-e 's:^#lockfile=:lockfile=:' \
@@ -339,6 +332,7 @@ src_configure() {
local myconf="--prefix=${PREFIX}/usr \
--libdir=${PREFIX}/usr/$(get_libdir) \
--libexecdir=${PREFIX}/usr/libexec \
+ --localstatedir=${EPREFIX}/var \
--disable-werror \
--disable-xen \
--enable-tools \