From nobody Sun May 19 08:26:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598440204; cv=none; d=zohomail.com; s=zohoarc; b=jZeseevNUJb5uTFNLxAbQiLqSiSbRXSSvRjA2Ya6WXmx39ao8dfDv4xmtN45jiB+LvurGDsdpTMmL6NPTwqtOoUGXB7cyFURpIbLgFQHITQYbUQHeDWXC5JRyh88K080AZdti1MCPr0QCGpVZWXj2lDekbjzvsUJV6Tjmx3o/ug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598440204; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D1g26c41eGJ9JbqAKW+ebPsU6Pne8C9pH3fo35R4NN0=; b=EW1YT4wV2rQ6Fp5zR01Eix6fjxFooLBbMFOn8h80pBmBkMOSkMPAp0ScV6WyTeEy4eSBmd7NJKrPQL/FPaSIlLa0C14WtWsaeujm8rIYYJOuQAsFrNWTBxBcUGRuoseibM2B0zC7uDJZRf0UHwwLOG4gGExFsLnbeXGJvD9vHG8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598440204146173.02278390391723; Wed, 26 Aug 2020 04:10:04 -0700 (PDT) Received: from localhost ([::1]:49412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAtJa-0004Rw-S2 for importer@patchew.org; Wed, 26 Aug 2020 07:10:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAtGK-0006Kz-2E for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:06:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:21273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAtEN-000388-KH for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:06:39 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-111-XPrvDIJvORq-V-t20je54w-1; Wed, 26 Aug 2020 07:04:35 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 839E856BE4; Wed, 26 Aug 2020 11:04:34 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id DED2139A55; Wed, 26 Aug 2020 11:04:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598439877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D1g26c41eGJ9JbqAKW+ebPsU6Pne8C9pH3fo35R4NN0=; b=ByHSiUMjwH1mMcavTFx5hTYPAuLyBMQxKTBxnjK60gULEn9hBPj4QX6V0qiE+CH1+UrgTV LMv05GN/7F8+pPbPII4M2L7yRBMrXDyK97UegAXPHEjYyGSU5FijzifbLPb3HBBX1+J1/m Gx4OV+HbVx8cMS4xPzZ8reoo2+ei/04= X-MC-Unique: XPrvDIJvORq-V-t20je54w-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v3 1/8] configure: rename confsuffix option Date: Wed, 26 Aug 2020 15:04:12 +0400 Message-Id: <20200826110419.528931-2-marcandre.lureau@redhat.com> In-Reply-To: <20200826110419.528931-1-marcandre.lureau@redhat.com> References: <20200826110419.528931-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 23:30:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sw@weilnetz.de, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau The value is used to construct conf/mod/data directories. Signed-off-by: Marc-Andr=C3=A9 Lureau --- configure | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure b/configure index b1e11397a8..0e04c47722 100755 --- a/configure +++ b/configure @@ -474,7 +474,7 @@ modules=3D"no" module_upgrades=3D"no" prefix=3D"/usr/local" firmwarepath=3D"\${prefix}/share/qemu-firmware" -confsuffix=3D"/qemu" +qemu_suffix=3D"/qemu" slirp=3D"" oss_lib=3D"" bsd=3D"no" @@ -1010,7 +1010,7 @@ if test "$mingw32" =3D "yes" ; then LIBS=3D"-liberty $LIBS" fi prefix=3D"c:/Program Files/QEMU" - confsuffix=3D"" + qemu_suffix=3D"" libs_qga=3D"-lws2_32 -lwinmm -lpowrprof -lwtsapi32 -lwininet -liphlpapi = -lnetapi32 $libs_qga" fi =20 @@ -1118,7 +1118,7 @@ for opt do ;; --datadir=3D*) datadir=3D"$optarg" ;; - --with-confsuffix=3D*) confsuffix=3D"$optarg" + --with-suffix=3D*) qemu_suffix=3D"$optarg" ;; --docdir=3D*) qemu_docdir=3D"$optarg" ;; @@ -1823,16 +1823,16 @@ Advanced options (experts only): --with-git=3DGIT use specified git [$git] --static enable static build [$static] --mandir=3DPATH install man pages in PATH - --datadir=3DPATH install firmware in PATH$confsuffix - --docdir=3DPATH install documentation in PATH$confsuffix + --datadir=3DPATH install firmware in PATH$qemu_suffix + --docdir=3DPATH install documentation in PATH$qemu_suffix --bindir=3DPATH install binaries in PATH --libdir=3DPATH install libraries in PATH --libexecdir=3DPATH install helper binaries in PATH - --sysconfdir=3DPATH install config in PATH$confsuffix + --sysconfdir=3DPATH install config in PATH$qemu_suffix --localstatedir=3DPATH install local state in PATH (set at runtime o= n win32) --firmwarepath=3DPATH search PATH for firmware files --efi-aarch64=3DPATH PATH of efi file to use for aarch64 VMs. - --with-confsuffix=3DSUFFIX suffix for QEMU data inside datadir/libdir/sy= sconfdir [$confsuffix] + --with-suffix=3DSUFFIX suffix for QEMU data inside datadir/libdir/sy= sconfdir [$qemu_suffix] --with-pkgversion=3DVERS use specified string as sub-version of the pa= ckage --enable-debug enable common debug build options --enable-sanitizers enable default sanitizers @@ -6467,9 +6467,9 @@ EOF fi fi =20 -qemu_confdir=3D$sysconfdir$confsuffix -qemu_moddir=3D$libdir$confsuffix -qemu_datadir=3D$datadir$confsuffix +qemu_confdir=3D$sysconfdir$qemu_suffix +qemu_moddir=3D$libdir$qemu_suffix +qemu_datadir=3D$datadir$qemu_suffix qemu_localedir=3D"$datadir/locale" qemu_icondir=3D"$datadir/icons" qemu_desktopdir=3D"$datadir/applications" --=20 2.26.2 From nobody Sun May 19 08:26:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598440068; cv=none; d=zohomail.com; s=zohoarc; b=Gd6wmc91WSv1Dj1Hxhf8X9uQyBVWlhI069hNlTpmtYyiLIler/7h8OycyOf57D8/cTOPDJYjD46LnD0fhvqsFZipwW8m5E4iab5lJNzvBOceOkzQBbO1ubgAgJcL6ZLzQBvrQmMviQUocE7bm7fekMcSk216Y33oOP+jvK9kBqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598440068; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bEQk/7b4iuk15wbAGxtyI0iAv4L+NwU0U/kEhBXITRM=; b=gALInaAK6Cc1c/Av7l4TFWjfEdbZKBKnx6TAUPpWII0zqnGc3zE78fa/0UA/S4RlhlW/PtUXcbVsfclILfIwWDXvh6PiH+gHpEmK3NpZy8RiztbIHoGNBsnA0BfhWJwKdPz34mAKRVRzh1BXX9MuCyMq0V2V2I0xNhDURylU0+4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598440068074952.091053649437; Wed, 26 Aug 2020 04:07:48 -0700 (PDT) Received: from localhost ([::1]:38170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAtHO-0008HV-Op for importer@patchew.org; Wed, 26 Aug 2020 07:07:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAtGR-0006et-NQ for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:06:47 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:29050 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAtEV-00038N-6d for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:06:47 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-173-f7akZ9LFNoecRrzRpqeSwA-1; Wed, 26 Aug 2020 07:04:41 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4EAF3807334; Wed, 26 Aug 2020 11:04:40 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DD5A1972A; Wed, 26 Aug 2020 11:04:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598439885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bEQk/7b4iuk15wbAGxtyI0iAv4L+NwU0U/kEhBXITRM=; b=Yea+hGhZMyzs+m5RBX6tGP258TEPHClqB3LeKJIdYbN52ZC+XW1pwxnUSXiMGF/o/A4swq NeUnqkIyr2lHwIhUeN2l/1DGfc0Uje82f+FMNn3GWOSrR7XIFx5yr6eAPF5SkY+VBTNq5z 58AthdBVjSkh8PUkt4IP9FQqjWPIjHQ= X-MC-Unique: f7akZ9LFNoecRrzRpqeSwA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v3 2/8] configure: always /-seperate directory from qemu_suffix Date: Wed, 26 Aug 2020 15:04:13 +0400 Message-Id: <20200826110419.528931-3-marcandre.lureau@redhat.com> In-Reply-To: <20200826110419.528931-1-marcandre.lureau@redhat.com> References: <20200826110419.528931-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/26 03:16:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sw@weilnetz.de, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Otherwise, we may accept very strange directory names... While at it, quote the variables. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- configure | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 0e04c47722..61216b9210 100755 --- a/configure +++ b/configure @@ -474,7 +474,7 @@ modules=3D"no" module_upgrades=3D"no" prefix=3D"/usr/local" firmwarepath=3D"\${prefix}/share/qemu-firmware" -qemu_suffix=3D"/qemu" +qemu_suffix=3D"qemu" slirp=3D"" oss_lib=3D"" bsd=3D"no" @@ -1823,12 +1823,12 @@ Advanced options (experts only): --with-git=3DGIT use specified git [$git] --static enable static build [$static] --mandir=3DPATH install man pages in PATH - --datadir=3DPATH install firmware in PATH$qemu_suffix - --docdir=3DPATH install documentation in PATH$qemu_suffix + --datadir=3DPATH install firmware in PATH/$qemu_suffix + --docdir=3DPATH install documentation in PATH/$qemu_suffix --bindir=3DPATH install binaries in PATH --libdir=3DPATH install libraries in PATH --libexecdir=3DPATH install helper binaries in PATH - --sysconfdir=3DPATH install config in PATH$qemu_suffix + --sysconfdir=3DPATH install config in PATH/$qemu_suffix --localstatedir=3DPATH install local state in PATH (set at runtime o= n win32) --firmwarepath=3DPATH search PATH for firmware files --efi-aarch64=3DPATH PATH of efi file to use for aarch64 VMs. @@ -6467,9 +6467,9 @@ EOF fi fi =20 -qemu_confdir=3D$sysconfdir$qemu_suffix -qemu_moddir=3D$libdir$qemu_suffix -qemu_datadir=3D$datadir$qemu_suffix +qemu_confdir=3D"$sysconfdir/$qemu_suffix" +qemu_moddir=3D"$libdir/$qemu_suffix" +qemu_datadir=3D"$datadir/$qemu_suffix" qemu_localedir=3D"$datadir/locale" qemu_icondir=3D"$datadir/icons" qemu_desktopdir=3D"$datadir/applications" --=20 2.26.2 From nobody Sun May 19 08:26:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598440144; cv=none; d=zohomail.com; s=zohoarc; b=ixJAot3GjVnWCjubvU04fQpWHQVWWlpSQHLim12dO+gaVAXaTf3PNArx4VaEoNU7ZxKtDkcgh+Ovyhr17pG2bazQyYq4AXanbUZ6huyn1byMF7Gr81KZDg2L1Dck7DfJfaPwEdCC0BlzUdQT0xcsMsKjxc1OcGWH3fMcKLjmnNU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598440144; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7FwKynu//NYHMVvyqf9/IcST7xvNIQRYBCR5V/7Gzkw=; b=Q1oiiUEvRCOu+QgGrk8DF4NwPDuof5tcu/fPugQ4Ooi8upvyQofWAMxyeRdvIdd8E53muW6yboCsSP1ffERvHF6gi3ZDRAUNDOicNjrMKb3ysWc67PNZ84n4QlhhvSf1JDPzEA/omLWFTFbJk+pstVSfsdAQioL97vwB4X7m93A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598440144527396.0278418264854; Wed, 26 Aug 2020 04:09:04 -0700 (PDT) Received: from localhost ([::1]:44304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAtId-0002NQ-9a for importer@patchew.org; Wed, 26 Aug 2020 07:09:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAtGX-0006l5-2t for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:06:53 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:39096 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAtEa-00038h-LI for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:06:52 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-7-AE5IZg8rN_eMpfmoqB_Nfw-1; Wed, 26 Aug 2020 07:04:49 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AF8AF10ABDBA; Wed, 26 Aug 2020 11:04:48 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id C314C1944D; Wed, 26 Aug 2020 11:04:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598439892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7FwKynu//NYHMVvyqf9/IcST7xvNIQRYBCR5V/7Gzkw=; b=YfwjtUMZs02UgAXaN3tpsN6HUVLObvPRsy19QwzrvzfQK/JCET3BWA1zQxVKa1cj1LV5xO 4wkUQx/eLKEsZmyM8x3/5R/5Ym7+HvjU5U8EJzaF/lGCF/5YYqgDH8nC1v5riwNhVaCzC5 Poo5ZeK2mgqs9UOO7C46giPdYflCL9Y= X-MC-Unique: AE5IZg8rN_eMpfmoqB_Nfw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v3 3/8] configure: build docdir like other suffixed directories Date: Wed, 26 Aug 2020 15:04:14 +0400 Message-Id: <20200826110419.528931-4-marcandre.lureau@redhat.com> In-Reply-To: <20200826110419.528931-1-marcandre.lureau@redhat.com> References: <20200826110419.528931-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/26 03:16:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sw@weilnetz.de, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau As documented in --help for --docdir. Signed-off-by: Marc-Andr=C3=A9 Lureau --- configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 61216b9210..e880e5676d 100755 --- a/configure +++ b/configure @@ -1676,14 +1676,14 @@ includedir=3D"${includedir:-$prefix/include}" if test "$mingw32" =3D "yes" ; then mandir=3D"$prefix" datadir=3D"$prefix" - qemu_docdir=3D"$prefix" + docdir=3D"$prefix" bindir=3D"$prefix" sysconfdir=3D"$prefix" local_statedir=3D else mandir=3D"${mandir:-$prefix/share/man}" datadir=3D"${datadir:-$prefix/share}" - qemu_docdir=3D"${qemu_docdir:-$prefix/share/doc/qemu}" + docdir=3D"${docdir:-$prefix/share/doc}" bindir=3D"${bindir:-$prefix/bin}" sysconfdir=3D"${sysconfdir:-$prefix/etc}" local_statedir=3D"${local_statedir:-$prefix/var}" @@ -1832,7 +1832,7 @@ Advanced options (experts only): --localstatedir=3DPATH install local state in PATH (set at runtime o= n win32) --firmwarepath=3DPATH search PATH for firmware files --efi-aarch64=3DPATH PATH of efi file to use for aarch64 VMs. - --with-suffix=3DSUFFIX suffix for QEMU data inside datadir/libdir/sy= sconfdir [$qemu_suffix] + --with-suffix=3DSUFFIX suffix for QEMU data inside datadir/libdir/sy= sconfdir/docdir [$qemu_suffix] --with-pkgversion=3DVERS use specified string as sub-version of the pa= ckage --enable-debug enable common debug build options --enable-sanitizers enable default sanitizers @@ -6470,6 +6470,7 @@ fi qemu_confdir=3D"$sysconfdir/$qemu_suffix" qemu_moddir=3D"$libdir/$qemu_suffix" qemu_datadir=3D"$datadir/$qemu_suffix" +qemu_docdir=3D"$docdir/$qemu_suffix" qemu_localedir=3D"$datadir/locale" qemu_icondir=3D"$datadir/icons" qemu_desktopdir=3D"$datadir/applications" --=20 2.26.2 From nobody Sun May 19 08:26:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598440308; cv=none; d=zohomail.com; s=zohoarc; b=Uc2btsLZ442e6ZDV16laFx9VJAyOBXXwmM2W/9X6fqzCcNRwRccDcpoPEQJ0U3w3v98hSY5MMRskNx9yFk9OgK/MU+uzZod0Ik6E7KXNHqty4ThLUxgWyuL7XC1S5aVPNFuFAuxoP90DdZPmu/OjAWvAR+fc2YNaQ3eA2mo68no= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598440308; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=STAiIOun13Xq9as09CTvKHfANgWUbmuNAt9hQQAyelE=; b=Qj3xWHDPiqdF08KIyOImP4R1tgaojNgHBYJU2LyEf3BR2J47nGKBqpCHBi0hdtlVnABb6xm8Eu76FHtqMycDDFYJMO1r8wZXbIj15D3rjrDAs3+1vkF8ehGg2ZYlqvqMhJQCecHdw5p60sObhG5Ek3KQFCkrQVMccGp0h3R3OXI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598440308034286.02134894202413; Wed, 26 Aug 2020 04:11:48 -0700 (PDT) Received: from localhost ([::1]:54014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAtLG-0006Pw-O7 for importer@patchew.org; Wed, 26 Aug 2020 07:11:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAtGj-00075H-1n for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:07:05 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:36468 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAtEm-00039M-Hm for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:07:04 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-493-GynGley4M3iYXk0d_feBNQ-1; Wed, 26 Aug 2020 07:05:00 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 70220807339; Wed, 26 Aug 2020 11:04:59 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DDEA1002D47; Wed, 26 Aug 2020 11:04:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598439903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=STAiIOun13Xq9as09CTvKHfANgWUbmuNAt9hQQAyelE=; b=iF25wRo3Dhb4Xv5wHM7rNaLiAcQuCtqp5ViahzOuxBEGbEkgyGhUfBQ3oYij1eYgtdtHkg X988dYWY43R1WDdDPPPknK1bcqsIe4xfB6/0jR1Kt0ZUU91w5kAo60UDddNugyapFtDSo2 Hye7wWWStMGwYnjAi8BKDZoKyOTiU/s= X-MC-Unique: GynGley4M3iYXk0d_feBNQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v3 4/8] meson: pass qemu_suffix option Date: Wed, 26 Aug 2020 15:04:15 +0400 Message-Id: <20200826110419.528931-5-marcandre.lureau@redhat.com> In-Reply-To: <20200826110419.528931-1-marcandre.lureau@redhat.com> References: <20200826110419.528931-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/26 03:16:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sw@weilnetz.de, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau The following patches will make use of it to fix installation paths. Signed-off-by: Marc-Andr=C3=A9 Lureau --- configure | 1 + meson_options.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/configure b/configure index e880e5676d..05b944fb8e 100755 --- a/configure +++ b/configure @@ -8223,6 +8223,7 @@ NINJA=3D$PWD/ninjatool $meson setup \ --mandir "${pre_prefix}$mandir" \ --sysconfdir "${pre_prefix}$sysconfdir" \ --localstatedir "${pre_prefix}$local_statedir" \ + -Dqemu_suffix=3D"$qemu_suffix" \ -Doptimization=3D$(if test "$debug" =3D yes; then echo 0; else ech= o 2; fi) \ -Ddebug=3D$(if test "$debug_info" =3D yes; then echo true; else ec= ho false; fi) \ -Dwerror=3D$(if test "$werror" =3D yes; then echo true; else echo = false; fi) \ diff --git a/meson_options.txt b/meson_options.txt index c55f9cd94c..1ef822bab3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ +option('qemu_suffix', type : 'string', value: '/qemu', + description: 'Suffix for QEMU data/modules/config directories (can = be empty)') option('gettext', type : 'boolean', value : true) option('sdl', type : 'feature', value : 'auto') option('sdl_image', type : 'feature', value : 'auto') --=20 2.26.2 From nobody Sun May 19 08:26:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598440139; cv=none; d=zohomail.com; s=zohoarc; b=NzNHS5KP59s/LWY28cF1Sb1KFNBnj5DVtn03rviSmcsZrc/V9YYxKBgdRDKuKhHL3jwEqu+wG/yQvEUojfO6VHsQR/ILFqfu8Oj8bqYawJ5zF7t07ZEhFuE+7BYZpLJdDgMJDT4G7PzG6dmmQho6ZSli6f5vFwb1lPKEw60hYdw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598440139; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=N4tB6I3nYPuouiOE7h1XE7EE2Hwx+d51x+BgWlmrYA4=; b=FNmmgAgFOGygTKp+ja1cHTTrNuOL/2Kej4188qcg2hFksaQVf4l2VswZRagpqyLl1oqT7YhtsTlx+ff+PdnPC2YiDbn5B6v23tyRYhgsRkqQyLo4cZmM00xm1hRxuHWJL1RXYGDc0sxQhALEnXNRyOoIsi0yODQZBj4GFSh6+i8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598440139938367.7329400709731; Wed, 26 Aug 2020 04:08:59 -0700 (PDT) Received: from localhost ([::1]:43794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAtIY-00029R-Ll for importer@patchew.org; Wed, 26 Aug 2020 07:08:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAtGt-0007ZI-I0 for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:07:15 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:23300 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAtEw-00039r-Uz for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:07:15 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-116-dsBjqkuMNLSoZY_LKTcMmQ-1; Wed, 26 Aug 2020 07:05:10 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6540F56BE3; Wed, 26 Aug 2020 11:05:09 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC1881972A; Wed, 26 Aug 2020 11:05:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598439913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N4tB6I3nYPuouiOE7h1XE7EE2Hwx+d51x+BgWlmrYA4=; b=cteZMzOSvVUOf/x4P+2ewZEZihQi2QFjZlTwAWngG7XG1O+A0EOqETWCl5AkFACQbyIjsC qqQk+Yixq/uzr/YCh2db8Jf25ufA9EAp+/7/BCXwsgcFyS3n7ex4XYvQpzm/U+eNPcSnsL 4B2o1exfXQbMix5NUuLwZEkFbzibnd8= X-MC-Unique: dsBjqkuMNLSoZY_LKTcMmQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v3 5/8] meson: use meson datadir instead of qemu_datadir Date: Wed, 26 Aug 2020 15:04:16 +0400 Message-Id: <20200826110419.528931-6-marcandre.lureau@redhat.com> In-Reply-To: <20200826110419.528931-1-marcandre.lureau@redhat.com> References: <20200826110419.528931-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/26 06:53:09 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sw@weilnetz.de, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau When cross-compiling, by default qemu_datadir is 'c:\Program Files\QEMU', which is not recognized as being an absolute path, and meson will end up adding the prefix again. Signed-off-by: Marc-Andr=C3=A9 Lureau --- contrib/vhost-user-gpu/meson.build | 2 +- meson.build | 3 ++- meson_options.txt | 2 +- pc-bios/descriptors/meson.build | 2 +- pc-bios/keymaps/meson.build | 6 +++--- pc-bios/meson.build | 2 +- tools/virtiofsd/meson.build | 2 +- trace/meson.build | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/me= son.build index 6c1459f54a..8df4c13bc5 100644 --- a/contrib/vhost-user-gpu/meson.build +++ b/contrib/vhost-user-gpu/meson.build @@ -9,5 +9,5 @@ if 'CONFIG_TOOLS' in config_host and 'CONFIG_VIRGL' in conf= ig_host \ configure_file(input: '50-qemu-gpu.json.in', output: '50-qemu-gpu.json', configuration: config_host, - install_dir: config_host['qemu_datadir'] / 'vhost-user') + install_dir: qemu_datadir / 'vhost-user') endif diff --git a/meson.build b/meson.build index f0fe5f8799..9f0d7d3830 100644 --- a/meson.build +++ b/meson.build @@ -17,6 +17,7 @@ config_all_disas =3D keyval.load(meson.current_build_dir(= ) / 'config-all-disas.mak enable_modules =3D 'CONFIG_MODULES' in config_host enable_static =3D 'CONFIG_STATIC' in config_host build_docs =3D 'BUILD_DOCS' in config_host +qemu_datadir =3D get_option('datadir') / get_option('qemu_suffix') config_host_data =3D configuration_data() genh =3D [] =20 @@ -1039,7 +1040,7 @@ foreach target : target_dirs output: exe_name + stp['ext'], capture: true, install: stp['install'], - install_dir: config_host['qemu_datadir'] / '../syste= mtap/tapset', + install_dir: qemu_datadir / '../systemtap/tapset', command: [ tracetool, '--group=3Dall', '--format=3D' + stp['f= mt'], '--binary=3D' + stp['bin'], diff --git a/meson_options.txt b/meson_options.txt index 1ef822bab3..9e8db82995 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,4 @@ -option('qemu_suffix', type : 'string', value: '/qemu', +option('qemu_suffix', type : 'string', value: 'qemu', description: 'Suffix for QEMU data/modules/config directories (can = be empty)') option('gettext', type : 'boolean', value : true) option('sdl', type : 'feature', value : 'auto') diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.bu= ild index 7c715bace8..3798d32372 100644 --- a/pc-bios/descriptors/meson.build +++ b/pc-bios/descriptors/meson.build @@ -10,5 +10,5 @@ foreach f: [ output: f, configuration: {'DATADIR': config_host['qemu_datadir']}, install: install_blobs, - install_dir: config_host['qemu_datadir'] / 'firmware') + install_dir: qemu_datadir / 'firmware') endforeach diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index b737c82230..bbac83ece3 100644 --- a/pc-bios/keymaps/meson.build +++ b/pc-bios/keymaps/meson.build @@ -44,13 +44,13 @@ foreach km, args: keymaps build_by_default: true, output: km, command: [native_qemu_keymap, '-f', '@OUTPUT@', args.= split()], - install_dir: config_host['qemu_datadir'] / 'keymaps') + install_dir: qemu_datadir / 'keymaps') endforeach if t.length() > 0 alias_target('update-keymaps', t) else # install from the source tree - install_data(keymaps.keys(), install_dir: config_host['qemu_datadir'] / = 'keymaps') + install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps') endif =20 -install_data(['sl', 'sv'], install_dir: config_host['qemu_datadir'] / 'key= maps') +install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps') diff --git a/pc-bios/meson.build b/pc-bios/meson.build index b6389f5148..c11e52ba26 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -19,7 +19,7 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host input: '@0@.bz2'.format(f), capture: true, install: install_blobs, - install_dir: config_host['qemu_datadir'], + install_dir: qemu_datadir, command: [ bzip2, '-dc', '@INPUT0@' ]) endforeach endif diff --git a/tools/virtiofsd/meson.build b/tools/virtiofsd/meson.build index d1e23c5760..50022ed89e 100644 --- a/tools/virtiofsd/meson.build +++ b/tools/virtiofsd/meson.build @@ -16,4 +16,4 @@ executable('virtiofsd', files( configure_file(input: '50-qemu-virtiofsd.json.in', output: '50-qemu-virtiofsd.json', configuration: config_host, - install_dir: config_host['qemu_datadir'] / 'vhost-user') + install_dir: qemu_datadir / 'vhost-user') diff --git a/trace/meson.build b/trace/meson.build index 56e870848e..5f0bf11cb5 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -55,7 +55,7 @@ trace_events_all =3D custom_target('trace-events-all', command: [ 'cat', '@INPUT@' ], capture: true, install: true, - install_dir: config_host['qemu_datadir']) + install_dir: qemu_datadir) =20 foreach d : [ ['generated-tcg-tracers.h', 'tcg-h'], --=20 2.26.2 From nobody Sun May 19 08:26:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598440172; cv=none; d=zohomail.com; s=zohoarc; b=UGQIn+bo2zgzpcvO9cHMTpRvu1j1pb8xy/Sly16bqJoO+KHb7UGXXlJQDucdKcX8845uWsHnBww40phS3Hjupcgaq6j6vw0WImJSFNvB34KNcRuRdjQaCK08QV38Ey8gfobXVpudiVw4U4Acu9I7n9t+TOQ4pglTY5fIEcUhwoM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598440172; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=karPnwRB29YKb9UlONxE3BzVQ4QV21LXDN2SYRgYcFQ=; b=M2DtBtkjzeBWS668NcfNqbySLqg3U/bizMLRkcefRdo9UcTGPMjrjYGMH/ANT1TUd+TSqKbw6G7XL2j8nUZA+BgbCVOUp44eMg86AaHgr89lm17aVxp+vKuwTUSxYV/o3ygzuxNnZYY78AbnWy0onm+CL62bzv2H2bc0pdbUjy8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598440172388577.0970469890491; Wed, 26 Aug 2020 04:09:32 -0700 (PDT) Received: from localhost ([::1]:46276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAtJ5-0003AL-0O for importer@patchew.org; Wed, 26 Aug 2020 07:09:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAtH2-0007yS-A6 for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:07:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:35513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAtF5-0003AU-O9 for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:07:23 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-10--tzdSrpSNhqnLL5mL9f5nA-1; Wed, 26 Aug 2020 07:05:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7C79556BE3; Wed, 26 Aug 2020 11:05:17 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id EFF0460C0F; Wed, 26 Aug 2020 11:05:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598439922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=karPnwRB29YKb9UlONxE3BzVQ4QV21LXDN2SYRgYcFQ=; b=BhXdqNZ4ZYyIA4fqbpEuSaTR92orCqyFvlQYP9HonWcjOPYD7hwweXBR4OISHLuu2xoeUk Y0QeZ1byc6TBs9BXzu4vW53T2KHTGCF7DMRguHtgELH8/dIv9T/Gm5rVDHujoI+TpwzF6f agnUhzhlQW3Eh74M4z5lArXNZuyLbEk= X-MC-Unique: -tzdSrpSNhqnLL5mL9f5nA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v3 6/8] meson: pass docdir option Date: Wed, 26 Aug 2020 15:04:17 +0400 Message-Id: <20200826110419.528931-7-marcandre.lureau@redhat.com> In-Reply-To: <20200826110419.528931-1-marcandre.lureau@redhat.com> References: <20200826110419.528931-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/26 06:53:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sw@weilnetz.de, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau When cross-compiling, by default qemu_docdir is 'c:\Program Files\QEMU\' which is not recognized as being an absolute path, and meson will end up adding the prefix again. Add an option to pass docdir location to meson, pre-prefixed like we do with other directories, build qemu_docdir with the common suffix and use that instead of config_host['qemu_docdir']. Signed-off-by: Marc-Andr=C3=A9 Lureau --- configure | 1 + docs/meson.build | 4 ++-- meson.build | 4 +++- meson_options.txt | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 05b944fb8e..7b6a4a8264 100755 --- a/configure +++ b/configure @@ -8223,6 +8223,7 @@ NINJA=3D$PWD/ninjatool $meson setup \ --mandir "${pre_prefix}$mandir" \ --sysconfdir "${pre_prefix}$sysconfdir" \ --localstatedir "${pre_prefix}$local_statedir" \ + -Ddocdir=3D"${pre_prefix}$docdir" \ -Dqemu_suffix=3D"$qemu_suffix" \ -Doptimization=3D$(if test "$debug" =3D yes; then echo 0; else ech= o 2; fi) \ -Ddebug=3D$(if test "$debug_info" =3D yes; then echo true; else ec= ho false; fi) \ diff --git a/docs/meson.build b/docs/meson.build index 8b059a8e39..50f367349b 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -10,7 +10,7 @@ if build_docs configure_file(output: 'index.html', input: files('index.html.in'), configuration: {'VERSION': meson.project_version()}, - install_dir: config_host['qemu_docdir']) + install_dir: qemu_docdir) manuals =3D [ 'devel', 'interop', 'tools', 'specs', 'system', 'user' ] man_pages =3D { 'interop' : { @@ -48,7 +48,7 @@ if build_docs input_dir, output_dir]) sphinxdocs +=3D this_manual if build_docs and manual !=3D 'devel' - install_subdir(output_dir, install_dir: config_host['qemu_docdir']) + install_subdir(output_dir, install_dir: qemu_docdir) endif =20 these_man_pages =3D [] diff --git a/meson.build b/meson.build index 9f0d7d3830..7570aab830 100644 --- a/meson.build +++ b/meson.build @@ -18,6 +18,7 @@ enable_modules =3D 'CONFIG_MODULES' in config_host enable_static =3D 'CONFIG_STATIC' in config_host build_docs =3D 'BUILD_DOCS' in config_host qemu_datadir =3D get_option('datadir') / get_option('qemu_suffix') +qemu_docdir =3D get_option('docdir') / get_option('qemu_suffix') config_host_data =3D configuration_data() genh =3D [] =20 @@ -1170,7 +1171,7 @@ if build_docs input: input, output: output, install: true, - install_dir: config_host['qemu_docdir'] / 'interop', + install_dir: qemu_docdir / 'interop', command: cmd + args) endforeach alias_target(ext, t) @@ -1233,6 +1234,7 @@ if targetos !=3D 'windows' else summary_info +=3D {'local state directory': 'queried at runtime'} endif +summary_info +=3D {'Doc directory': get_option('docdir')} summary_info +=3D {'Build directory': meson.current_build_dir()} summary_info +=3D {'Source path': meson.current_source_dir()} summary_info +=3D {'GIT binary': config_host['GIT']} diff --git a/meson_options.txt b/meson_options.txt index 9e8db82995..555b860902 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,7 @@ option('qemu_suffix', type : 'string', value: 'qemu', description: 'Suffix for QEMU data/modules/config directories (can = be empty)') +option('docdir', type : 'string', value : 'doc', + description: 'Base directory for documentation installation (can be= empty)') option('gettext', type : 'boolean', value : true) option('sdl', type : 'feature', value : 'auto') option('sdl_image', type : 'feature', value : 'auto') --=20 2.26.2 From nobody Sun May 19 08:26:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598440248; cv=none; d=zohomail.com; s=zohoarc; b=TzPAzI3m6WUfTMdF6PpJHDcOH0XLanfO7w+GxfkALVFyEHK8irSNmH4j9dw37iTHF7TE6YHriX4s5CG6m+qmMW/8c3Tu0tzJB3k8FqvUweYkPnhDBHtZ7HeVYpOROu1nU1US4QlDQeiB6tCAHZvhcM6nSAkIIQXTb+ZhqNdbjqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598440248; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=G/LPOWdVtfu0NeWrtB6c9HQIy2uWkD+ZKoUqKz8BE1g=; b=fY5AS9gS1btp5Z5pVkRdoYTPi+C3QLdMSacVGEEXyxT1ZnE3XGTIs7GpHkZLIOpU7p9NXbfAQZvcGFIADmi5TbVadscuEoiB6ncU7FKPZgOoquEPH8Raa8x1ifOP/2WMPY2D3XXnpeev+lrnyWWzG2SS6mbFzrTo56yM5w1B/uc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598440248336135.68677751169105; Wed, 26 Aug 2020 04:10:48 -0700 (PDT) Received: from localhost ([::1]:51290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAtKJ-0005Cx-2X for importer@patchew.org; Wed, 26 Aug 2020 07:10:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAtH7-0008DL-LK for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:07:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41474) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAtFB-0003BJ-4t for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:07:29 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-339-KyFZXRfPNU2R0N9c68yUCQ-1; Wed, 26 Aug 2020 07:05:26 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4435B56BE3; Wed, 26 Aug 2020 11:05:25 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB2945C1A3; Wed, 26 Aug 2020 11:05:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598439928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G/LPOWdVtfu0NeWrtB6c9HQIy2uWkD+ZKoUqKz8BE1g=; b=bUNEzGsPH8Uc6zV9h3Iq3KYfhocxK5vKVWl3MXGL2kppKkaE64iv9qFjqHGyK6yau4NwCN J98ngOQkfhxuCphK/Fmmjcmq8W/K5BHFkfHe+cpl+lHmjRKWG8mFhplfV4v7JQPuZVSOdA 9M6ee9it+qh29Eu1vmGj6NMCFJuBhuw= X-MC-Unique: KyFZXRfPNU2R0N9c68yUCQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v3 7/8] meson: use meson mandir instead of qemu_mandir Date: Wed, 26 Aug 2020 15:04:18 +0400 Message-Id: <20200826110419.528931-8-marcandre.lureau@redhat.com> In-Reply-To: <20200826110419.528931-1-marcandre.lureau@redhat.com> References: <20200826110419.528931-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 23:30:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sw@weilnetz.de, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau When cross-compiling, by default qemu_mandir is 'c:\Program Files\QEMU', which is not recognized as being an absolute path, and meson will end up adding the prefix again. Use the pre-prefixed meson mandir option instead. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Marc-Andr=C3=A9 Lureau --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 7570aab830..d3196ea2d2 100644 --- a/meson.build +++ b/meson.build @@ -1211,7 +1211,7 @@ if build_docs output: man, capture: true, install: true, - install_dir: config_host['mandir'] / 'man7', + install_dir: get_option('mandir') / 'man7', command: [pod2man, '--utf8', '--section=3D7', '-= -center=3D" "', '--release=3D" "', '@INPUT@']) endforeach --=20 2.26.2 From nobody Sun May 19 08:26:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598440362; cv=none; d=zohomail.com; s=zohoarc; b=gy+yK9LaHSBlAbMMDkP9l/QFytbxLLxQ4ic2VZGqV7zkmLBxGadCJfAWH5NJGZVVXP2/EJ08fGmR4/FUTy0+FYLUhSeKEhqZRC/VA5TAHFmOQJp4GyosDYIRmec+lfimdn5ZfBwgMGbUq505MkhV3M/ZiojNqUJ+Us3CtZiqR1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598440362; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YJ9OCGpbJMK0UM9Ml3aUJFwyvCq/CnrXrDZTZHJCXT0=; b=i0SKCzvMvsui05a6wjpOcv5jOnYt7v4lOSz1Jdm5ee+cH/2vak47G0VPnK/dqTfvRmh0Da3bZgQ+5Kq7Cg2wJPlmG3hzXOSE/9OrfYnp0LmrlAcgrgpk8MSra7ayWpQlQm9wpXj/8rMyYdsE6Z0UJaa4/H9UcnbLWEKfiipPSyg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598440362783317.4873426718658; Wed, 26 Aug 2020 04:12:42 -0700 (PDT) Received: from localhost ([::1]:57632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAtM9-0007ud-J1 for importer@patchew.org; Wed, 26 Aug 2020 07:12:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAtHH-0000DF-B6 for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:07:39 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:55583 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAtFK-0003GS-Ml for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:07:38 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-240-N_-CPEDmPLGLwaBoX7YIAQ-1; Wed, 26 Aug 2020 07:05:34 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A473610ABDB8; Wed, 26 Aug 2020 11:05:33 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CD9C10013C2; Wed, 26 Aug 2020 11:05:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598439937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YJ9OCGpbJMK0UM9Ml3aUJFwyvCq/CnrXrDZTZHJCXT0=; b=WL21WcnGb1EI827XETUgUXwTaYTsV9ZzqVLVn1eWqHvIPVzyez0igo5O4yQ61WNOGwIxDN fS1L+NcTnz7Cdby/Wq4LZfdhMdjB1DNkjI00OCbRo6M3xOVdFbw9Uxxblxr7PCHRRvAQKE NfQKvkP9hLTPiuaM7jP55MMufisgQVo= X-MC-Unique: N_-CPEDmPLGLwaBoX7YIAQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v3 8/8] meson: add NSIS building Date: Wed, 26 Aug 2020 15:04:19 +0400 Message-Id: <20200826110419.528931-9-marcandre.lureau@redhat.com> In-Reply-To: <20200826110419.528931-1-marcandre.lureau@redhat.com> References: <20200826110419.528931-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/26 06:53:09 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sw@weilnetz.de, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 --- Makefile | 56 ----------------------------------- meson.build | 25 ++++++++++++++++ scripts/nsis.py | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 56 deletions(-) create mode 100644 scripts/nsis.py diff --git a/Makefile b/Makefile index 81794d5c34..3ebd6929b4 100644 --- a/Makefile +++ b/Makefile @@ -294,62 +294,6 @@ endif "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" =20 -ifdef CONFIG_WIN32 - -INSTALLER =3D qemu-setup-$(VERSION)$(EXESUF) - -nsisflags =3D -V2 -NOCD - -ifneq ($(wildcard $(SRC_PATH)/dll),) -ifeq ($(ARCH),x86_64) -# 64 bit executables -DLL_PATH =3D $(SRC_PATH)/dll/w64 -nsisflags +=3D -DW64 -else -# 32 bit executables -DLL_PATH =3D $(SRC_PATH)/dll/w32 -endif -endif - -.PHONY: installer -installer: $(INSTALLER) - -INSTDIR=3D/tmp/qemu-nsis - -$(INSTALLER): $(SRC_PATH)/qemu.nsi - $(MAKE) install DESTDIR=3D${INSTDIR} -ifdef SIGNCODE - (cd ${INSTDIR}/${bindir}; \ - for i in *.exe; do \ - $(SIGNCODE) $${i}; \ - done \ - ) -endif # SIGNCODE - (cd ${INSTDIR}/${bindir}; \ - for i in qemu-system-*.exe; do \ - arch=3D$${i%.exe}; \ - arch=3D$${arch#qemu-system-}; \ - echo Section \"$$arch\" Section_$$arch; \ - echo SetOutPath \"\$$INSTDIR\"; \ - echo File \"\$${BINDIR}\\$$i\"; \ - echo SectionEnd; \ - done \ - ) >${INSTDIR}/${bindir}/system-emulations.nsh - makensis $(nsisflags) \ - $(if $(BUILD_DOCS),-DCONFIG_DOCUMENTATION=3D"y") \ - $(if $(CONFIG_GTK),-DCONFIG_GTK=3D"y") \ - -DBINDIR=3D"${INSTDIR}/${bindir}" \ - $(if $(DLL_PATH),-DDLLDIR=3D"$(DLL_PATH)") \ - -DSRCDIR=3D"$(SRC_PATH)" \ - -DOUTFILE=3D"$(INSTALLER)" \ - -DDISPLAYVERSION=3D"$(VERSION)" \ - $(SRC_PATH)/qemu.nsi - rm -r ${INSTDIR} -ifdef SIGNCODE - $(SIGNCODE) $(INSTALLER) -endif # SIGNCODE -endif # CONFIG_WIN - # Add a dependency on the generated files, so that they are always # rebuilt before other object files ifneq ($(wildcard config-host.mak),) diff --git a/meson.build b/meson.build index d3196ea2d2..eef6e67103 100644 --- a/meson.build +++ b/meson.build @@ -1218,6 +1218,31 @@ if build_docs endif endif =20 +if host_machine.system() =3D=3D 'windows' + nsis_cmd =3D [ + find_program('scripts/nsis.py'), + '@OUTPUT@', + get_option('prefix'), + meson.current_source_dir(), + host_machine.cpu_family(), + '--', + '-DDISPLAYVERSION=3D' + meson.project_version(), + ] + if build_docs + nsis_cmd +=3D '-DCONFIG_DOCUMENTATION=3Dy' + endif + if 'CONFIG_GTK' in config_host + nsis_cmd +=3D '-DCONFIG_GTK=3Dy' + endif + + nsis =3D custom_target('nsis', + output: 'qemu-setup-' + meson.project_version() + '= .exe', + input: files('qemu.nsi'), + build_always_stale: true, + command: nsis_cmd + ['@INPUT@']) + alias_target('installer', nsis) +endif + summary_info =3D {} summary_info +=3D {'Install prefix': config_host['prefix']} summary_info +=3D {'BIOS directory': config_host['qemu_datadir']} diff --git a/scripts/nsis.py b/scripts/nsis.py new file mode 100644 index 0000000000..e1c409344e --- /dev/null +++ b/scripts/nsis.py @@ -0,0 +1,78 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2020 Red Hat, Inc. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import argparse +import glob +import os +import shutil +import subprocess +import tempfile + + +def signcode(path): + cmd =3D os.environ.get("SIGNCODE") + if not cmd: + return + subprocess.run([cmd, path]) + + +def main(): + parser =3D argparse.ArgumentParser(description=3D"QEMU NSIS build help= er.") + parser.add_argument("outfile") + parser.add_argument("prefix") + parser.add_argument("srcdir") + parser.add_argument("cpu") + parser.add_argument("nsisargs", nargs=3D"*") + args =3D parser.parse_args() + + destdir =3D tempfile.mkdtemp() + try: + subprocess.run(["make", "install", "DESTDIR=3D" + destdir + os.pat= h.sep]) + with open( + os.path.join(destdir + args.prefix, "system-emulations.nsh"), = "w" + ) as nsh: + for exe in glob.glob( + os.path.join(destdir + args.prefix, "qemu-system-*.exe") + ): + exe =3D os.path.basename(exe) + arch =3D exe[12:-4] + nsh.write( + """ + Section "{0}" Section_{0} + SetOutPath "$INSTDIR" + File "${{BINDIR}}\\{1}" + SectionEnd + """.format( + arch, exe + ) + ) + + for exe in glob.glob(os.path.join(destdir + args.prefix, "*.exe")): + signcode(exe) + + makensis =3D [ + "makensis", + "-V2", + "-NOCD", + "-DSRCDIR=3D" + args.srcdir, + "-DBINDIR=3D" + destdir + args.prefix, + ] + dlldir =3D "w32" + if args.cpu =3D=3D "x86_64": + dlldir =3D "w64" + makensis +=3D ["-DW64"] + if os.path.exists(os.path.join(args.srcdir, "dll")): + makensis +=3D "-DDLLDIR=3D{0}/dll/{1}".format(args.srcdir, dll= dir) + + makensis +=3D ["-DOUTFILE=3D" + args.outfile] + args.nsisargs + subprocess.run(makensis) + signcode(args.outfile) + finally: + shutil.rmtree(destdir) + + +if __name__ =3D=3D "__main__": + main() --=20 2.26.2