From 19210f286efe1cfbc6fd71bbe06782b61f8ffa14 Mon Sep 17 00:00:00 2001 From: Yixun Lan Date: Tue, 2 May 2017 16:27:58 +0800 Subject: [PATCH] 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 97abadec279e5..b0b687340dbbc 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 \