From patchwork Wed Sep 23 11:03:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 11794845 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CBC8616BC for ; Wed, 23 Sep 2020 11:05:47 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9D3AF206A5 for ; Wed, 23 Sep 2020 11:05:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="UV8BQRa1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9D3AF206A5 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kL2Zh-0003ps-R1; Wed, 23 Sep 2020 11:04:37 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kL2Zg-0003pn-Gc for xen-devel@lists.xenproject.org; Wed, 23 Sep 2020 11:04:36 +0000 X-Inumbo-ID: 0db72009-7e60-4bb4-ad83-b140ad64e5b7 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0db72009-7e60-4bb4-ad83-b140ad64e5b7; Wed, 23 Sep 2020 11:04:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1600859075; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=lX7mdqYYdpd7vIbpWme5ezs+xGmJm1ZWzKO9Dfq4pJI=; b=UV8BQRa1AeProNKo9iW+BYFQkCQcKoo6IFbrD6SLwQrwI0Peye/LovqZ O9GcuelzEVu9YfUYQgDbEGV+qu0NaibOrxxmJD6IrTTglQGxmWQ/s9ech VX5l0gMuZvJRMrypBNCimi6JoPc6kR6RVIAd9L0nDeRIHEsARFC5uEKFg U=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: soLdDUUyYssFVJPPcqgcfqVQS2BeUxBzsEfFIfKEtA4OxxpeUaD/VMHo6Um+T4zOz2x+K4WPTz xye3PZpQnuU+Bt06kZqmswuGgHA2EEEevVOYk7If+22TFBySrFAhMVEA9Xzf/MQIQw1YsC0UNB qoPsS+ukiywI7VoAbzFP2093A6TCY3BBkqY9jfK1KTCM9bBO86w/uHJ36Bk4IKWULEd3I0Rmo0 QbbrTGmAYXcbeYT4qJf/F9+CEov706V6IZ3ZZuMt6Z1KixVqkwqfTbXKMTT8CKzImUZiL5mIuU VRg= X-SBRS: 2.7 X-MesageID: 27364818 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.77,293,1596513600"; d="scan'208";a="27364818" From: Anthony PERARD To: CC: Paul Durrant , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH] tools: Fix configure of upstream QEMU Date: Wed, 23 Sep 2020 12:03:23 +0100 Message-ID: <20200923110323.1980725-1-anthony.perard@citrix.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" QEMU as recently switch its build system to use meson and the ./configure step with meson is more restrictive that the step used to be, most installation path wants to be within prefix, otherwise we have this error message: ERROR: The value of the 'datadir' option is '/usr/share/qemu-xen' which must be a subdir of the prefix '/usr/lib/xen'. In order to workaround the limitation, we will set prefix to the same one as for the rest of Xen installation, and set all the other paths. For reference, a thread in qemu-devel: "configure with datadir outside of --prefix fails with meson" https://lore.kernel.org/qemu-devel/20200918133012.GH2024@perard.uk.xensource.com/t/ And an issue in meson: "artificial limitation of directories (forced to be in prefix)" https://github.com/mesonbuild/meson/issues/2561 Signed-off-by: Anthony PERARD Tested-by: Paul Durrant Acked-by: Wei Liu --- I've tested the change with an oldish QEMU, qemu-xen-4.12, and the layout of the tarball generated by osstest doesn't change. --- tools/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 198b239edcc1..ff21f1125f66 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -238,7 +238,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find $$source/configure --enable-xen --target-list=i386-softmmu \ $(QEMU_XEN_ENABLE_DEBUG) \ $$enable_trace_backend \ - --prefix=$(LIBEXEC) \ + --prefix=$(prefix) \ --libdir=$(LIBEXEC_LIB) \ --includedir=$(LIBEXEC_INC) \ --extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \ @@ -274,6 +274,10 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find --bindir=$(LIBEXEC_BIN) \ --datadir=$(SHAREDIR)/qemu-xen \ --localstatedir=$(localstatedir) \ + --docdir=$(LIBEXEC)/share/doc \ + --mandir=$(LIBEXEC)/share/man \ + --libexecdir=$(LIBEXEC)/libexec \ + --firmwarepath=$(LIBEXEC)/share/qemu-firmware \ --disable-kvm \ --disable-docs \ --disable-guest-agent \