From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 126C2C433F5 for ; Wed, 20 Apr 2022 15:31:54 +0000 (UTC) Received: from localhost ([::1]:36634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhCJ7-0002RZ-66 for qemu-devel@archiver.kernel.org; Wed, 20 Apr 2022 11:31:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhC2Z-00022h-GL for qemu-devel@nongnu.org; Wed, 20 Apr 2022 11:14:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:38493) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhC2V-0005x8-Ip for qemu-devel@nongnu.org; Wed, 20 Apr 2022 11:14:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650467682; h=from:from:reply-to: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=nj4uLf6CizVu2uBOCReB6+YBcECm5SGFPUXsnJrdIMo=; b=bT2/qUR0GKZutccz7MZ6ZbmVwZ1lJBbHi1bsjaC6S5Ld++/+YMyc80f0qIYADrYhrLhfNF IhPAREornCZmaS20Nk1U5ocFp7/niWZmZ6qpDw3vp5m9R54wM7MJ5synus29hYy10e5L/l ltN9JKxekxHBQsTIVcgYumc/RClsHnk= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-125-gqdAW3ZXNXyeGnJLWtaHmg-1; Wed, 20 Apr 2022 11:14:39 -0400 X-MC-Unique: gqdAW3ZXNXyeGnJLWtaHmg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AEE821C0513F; Wed, 20 Apr 2022 15:14:38 +0000 (UTC) Received: from redhat.com (unknown [10.33.36.162]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EC8C42166B44; Wed, 20 Apr 2022 15:14:27 +0000 (UTC) Date: Wed, 20 Apr 2022 16:14:25 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Konstantin Kostiuk Subject: Re: [PATCH 08/41] build-sys: simplify MSI's QEMU_GA_MANUFACTURER Message-ID: References: <20220420132624.2439741-1-marcandre.lureau@redhat.com> <20220420132624.2439741-9-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.1.5 (2021-12-30) X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Yan Vugenfirer , QEMU , Michael Roth Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, Apr 20, 2022 at 04:48:54PM +0300, Konstantin Kostiuk wrote: > Hi Marc-André and Yan, > > Currently, we use this for the mingw-qemu-ga-win package in CentOS Stream 9 > and RHEL. > https://gitlab.com/redhat/centos-stream/rpms/mingw-qemu-ga-win/-/blob/c9s/build_configure.sh > > Yan, do we need this feature or not? IMHO the downstream customization makes sense, similar to how with RPMs we set Red Hat as the vendor. We neeed proper meson_options.txt entries and configure --with-qga-...=.... options > On Wed, Apr 20, 2022 at 4:27 PM wrote: > > > From: Marc-André Lureau > > > > If there is any reason to allow customization of this variable, we > > should provide a proper configure option. > > > > Signed-off-by: Marc-André Lureau > > --- > > configure | 4 ---- > > qga/installer/qemu-ga.wxs | 10 ++++------ > > qga/meson.build | 1 - > > 3 files changed, 4 insertions(+), 11 deletions(-) > > > > diff --git a/configure b/configure > > index 8cbe55ac82e8..5ac653b21351 100755 > > --- a/configure > > +++ b/configure > > @@ -2694,9 +2694,6 @@ fi > > > > # Guest agent Windows MSI package > > > > -if test "$QEMU_GA_MANUFACTURER" = ""; then > > - QEMU_GA_MANUFACTURER=QEMU > > -fi > > if test "$QEMU_GA_DISTRO" = ""; then > > QEMU_GA_DISTRO=Linux > > fi > > @@ -2790,7 +2787,6 @@ if test "$debug_tcg" = "yes" ; then > > fi > > if test "$mingw32" = "yes" ; then > > echo "CONFIG_WIN32=y" >> $config_host_mak > > - echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER}" >> $config_host_mak > > echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO}" >> $config_host_mak > > echo "QEMU_GA_VERSION=${QEMU_GA_VERSION}" >> $config_host_mak > > else > > diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs > > index 0950e8c6becc..53d836c06a96 100644 > > --- a/qga/installer/qemu-ga.wxs > > +++ b/qga/installer/qemu-ga.wxs > > @@ -8,9 +8,7 @@ > > > > > > > > - > > - > > - > > + > > > > > > > > @@ -43,14 +41,14 @@ > > Name="QEMU guest agent" > > Id="*" > > UpgradeCode="{EB6B8302-C06E-4BEC-ADAC-932C68A3A98D}" > > - Manufacturer="$(env.QEMU_GA_MANUFACTURER)" > > + Manufacturer="$(var.QEMU_GA_MANUFACTURER)" > > Version="$(env.QEMU_GA_VERSION)" > > Language="1033"> > > > > NOT VersionNT64 > > > > > - Manufacturer="$(env.QEMU_GA_MANUFACTURER)" > > + Manufacturer="$(var.QEMU_GA_MANUFACTURER)" > > InstallerVersion="200" > > Languages="1033" > > Compressed="yes" > > @@ -133,7 +131,7 @@ > > > > > Guid="{D075D109-51CA-11E3-9F8B-000C29858960}"> > > > - > > Key="Software\$(env.QEMU_GA_MANUFACTURER)\$(env.QEMU_GA_DISTRO)\Tools\QemuGA"> > > + > > Key="Software\$(var.QEMU_GA_MANUFACTURER)\$(env.QEMU_GA_DISTRO)\Tools\QemuGA"> > > > Value="fb0a0d66-c7fb-4e2e-a16b-c4a3bfe8d13b" /> > > > Value="$(env.QEMU_GA_VERSION)" /> > > > > diff --git a/qga/meson.build b/qga/meson.build > > index da5e5efb19e8..6e57de430d29 100644 > > --- a/qga/meson.build > > +++ b/qga/meson.build > > @@ -123,7 +123,6 @@ if targetos == 'windows' > > command: [ > > find_program('env'), > > 'QEMU_GA_VERSION=' + > > config_host['QEMU_GA_VERSION'], > > - 'QEMU_GA_MANUFACTURER=' + > > config_host['QEMU_GA_MANUFACTURER'], > > 'QEMU_GA_DISTRO=' + > > config_host['QEMU_GA_DISTRO'], > > 'BUILD_DIR=' + meson.build_root(), > > wixl, '-o', '@OUTPUT0@', '@INPUT0@', > > -- > > 2.35.1.693.g805e0a68082a > > > > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|