From nobody Sat May 18 22:14:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598447359; cv=none; d=zohomail.com; s=zohoarc; b=WYuO0NPJtE2j2lxFAHLzmiUStQuxqbTTGosSlKk5YZIFOfwcfDtTmEiupJZ0i68UAJhuGpc8j309IJQX3OHRBgYctHnnb4xXKEf17C/QEgzHSI7A/rhK7SIymtVuSthdC1tuyZOE6UhzYbHxgmh0PVVjyyUCey4fAn3t+Btr/es= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598447359; 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=wG6pTPfrkr4FA5F6SjyIDMte6/yvih8bFglacvGBJ1s=; b=firSTqCkF+JGi45o07YxJnq3f7mxHV2oiYljLaPeYV86OKU2sLNhM9NGU1mzr0Y6jXVq0/lvcP1eM6WuISihCNQ2obVociPwh4nwK5U3GAMiNE61jYXnbBzXkGfkUEoCV4Q570YM2fIxLPhan6DZufjaiswkuYkL3LYx5ufQVQM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1598447359160525.6918957996434; Wed, 26 Aug 2020 06:09:19 -0700 (PDT) Received: from localhost ([::1]:59154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAvAz-0008Ao-Ti for importer@patchew.org; Wed, 26 Aug 2020 09:09:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAv8T-000491-4e for qemu-devel@nongnu.org; Wed, 26 Aug 2020 09:06:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:26271 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 1kAv8R-0002Dm-AJ for qemu-devel@nongnu.org; Wed, 26 Aug 2020 09:06:40 -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-12-m9ANjzU5MH-2PCd8piOUNg-1; Wed, 26 Aug 2020 09:06:36 -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 3D448AE400 for ; Wed, 26 Aug 2020 13:06:35 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1391C18B59; Wed, 26 Aug 2020 13:06:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598447198; 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=wG6pTPfrkr4FA5F6SjyIDMte6/yvih8bFglacvGBJ1s=; b=B7oSu6ck5b00FlZr/o+jvXtTJ7r/+BHefyJCSuis1WCkDW6D0QZ5okMQDYHPKdpir3wHTM vfJilKuoKV5nB2CKZ6Hok6joxSFRk/eYBZTv50kVB/IuDL6WFz/L24TLlje5Yaib5u4BHq nc47z0D+05E5i0QMBi2qXq3RQRQ2cFo= X-MC-Unique: m9ANjzU5MH-2PCd8piOUNg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 1/6] meson: install pc-bios blobs Date: Wed, 26 Aug 2020 17:06:17 +0400 Message-Id: <20200826130622.553318-2-marcandre.lureau@redhat.com> In-Reply-To: <20200826130622.553318-1-marcandre.lureau@redhat.com> References: <20200826130622.553318-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=205.139.110.120; 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 01:10:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: pbonzini@redhat.com, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- Makefile | 31 ---------------------- pc-bios/meson.build | 63 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 81794d5c34..16b2ffa7fe 100644 --- a/Makefile +++ b/Makefile @@ -229,32 +229,6 @@ distclean: clean ninja-distclean rm -f linux-headers/asm rm -Rf .sdk =20 -ifdef INSTALL_BLOBS -BLOBS=3Dbios.bin bios-256k.bin bios-microvm.bin sgabios.bin vgabios.bin vg= abios-cirrus.bin \ -vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \ -vgabios-ramfb.bin vgabios-bochs-display.bin vgabios-ati.bin \ -openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.b= in \ -pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \ -pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ -efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \ -efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \ -efi-e1000e.rom efi-vmxnet3.rom \ -qemu-nsis.bmp \ -bamboo.dtb canyonlands.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ -multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin \ -s390-ccw.img s390-netboot.img \ -slof.bin skiboot.lid \ -palcode-clipper \ -u-boot.e500 u-boot-sam460-20100605.bin \ -qemu_vga.ndrv \ -edk2-licenses.txt \ -hppa-firmware.img \ -opensbi-riscv32-generic-fw_dynamic.bin opensbi-riscv64-generic-fw_dynamic.= bin \ -opensbi-riscv32-generic-fw_dynamic.elf opensbi-riscv64-generic-fw_dynamic.= elf -else -BLOBS=3D -endif - install-datadir: $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)" =20 @@ -272,11 +246,6 @@ export DESTDIR install: all install-datadir install-localstatedir ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir) -endif -ifneq ($(BLOBS),) - set -e; for x in $(BLOBS); do \ - $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \ - done endif for s in $(ICON_SIZES); do \ mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \ diff --git a/pc-bios/meson.build b/pc-bios/meson.build index b6389f5148..f608c2cdba 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -24,5 +24,68 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host endforeach endif =20 +blobs =3D files( + 'bios.bin', + 'bios-256k.bin', + 'bios-microvm.bin', + 'sgabios.bin', + 'vgabios.bin', + 'vgabios-cirrus.bin', + 'vgabios-stdvga.bin', + 'vgabios-vmware.bin', + 'vgabios-qxl.bin', + 'vgabios-virtio.bin', + 'vgabios-ramfb.bin', + 'vgabios-bochs-display.bin', + 'vgabios-ati.bin', + 'openbios-sparc32', + 'openbios-sparc64', + 'openbios-ppc', + 'QEMU,tcx.bin', + 'QEMU,cgthree.bin', + 'pxe-e1000.rom', + 'pxe-eepro100.rom', + 'pxe-ne2k_pci.rom', + 'pxe-pcnet.rom', + 'pxe-rtl8139.rom', + 'pxe-virtio.rom', + 'efi-e1000.rom', + 'efi-eepro100.rom', + 'efi-ne2k_pci.rom', + 'efi-pcnet.rom', + 'efi-rtl8139.rom', + 'efi-virtio.rom', + 'efi-e1000e.rom', + 'efi-vmxnet3.rom', + 'qemu-nsis.bmp', + 'bamboo.dtb', + 'canyonlands.dtb', + 'petalogix-s3adsp1800.dtb', + 'petalogix-ml605.dtb', + 'multiboot.bin', + 'linuxboot.bin', + 'linuxboot_dma.bin', + 'kvmvapic.bin', + 'pvh.bin', + 's390-ccw.img', + 's390-netboot.img', + 'slof.bin', + 'skiboot.lid', + 'palcode-clipper', + 'u-boot.e500', + 'u-boot-sam460-20100605.bin', + 'qemu_vga.ndrv', + 'edk2-licenses.txt', + 'hppa-firmware.img', + 'opensbi-riscv32-generic-fw_dynamic.bin', + 'opensbi-riscv64-generic-fw_dynamic.bin', + 'opensbi-riscv32-generic-fw_dynamic.elf', + 'opensbi-riscv64-generic-fw_dynamic.elf', +) + +if install_blobs + install_data(blobs, install_dir: config_host['qemu_datadir']) +endif + subdir('descriptors') subdir('keymaps') --=20 2.26.2 From nobody Sat May 18 22:14:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598447278; cv=none; d=zohomail.com; s=zohoarc; b=RPed/rlJypAmVdmbMAoFGoio1r1/8dzkansdZyOe3Dz7yYzoDCSnfooRKgCAOd4f/yODm7LVm+W46WQ42zxvHdx34MPkr1cxnypuMRYZpOiUbnzUO12xeFN1f75QR6mgaViMlc1NSETIj6LxzVw7+5HpPcgY0MCyh2HpF04vBiY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598447278; 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=uNK5jhcbpw5zyWw+KpnINndLmxU5aXnh7v/dKW/pb7I=; b=YtOIr4ONmItzfemcdKu+cqsR24zlxQBRQPw1c+isoLN5PhLJGqtFulxB/hzFZ+5tFtCrFLj0RScbLEVniEqFK69gfhGhh/29RjdO5NOSVTAk6yq5BMpofnNhlDCY8+MPbDf9r4QlJa3Q1B+iLSBhiRPSV5jioLihWc6yuzYjxVo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1598447278614916.2769979286759; Wed, 26 Aug 2020 06:07:58 -0700 (PDT) Received: from localhost ([::1]:52622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAv9g-0005YF-WC for importer@patchew.org; Wed, 26 Aug 2020 09:07:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAv8a-0004EP-NA for qemu-devel@nongnu.org; Wed, 26 Aug 2020 09:06:48 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:49542 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 1kAv8Y-0002EL-TG for qemu-devel@nongnu.org; Wed, 26 Aug 2020 09:06:48 -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-200-bEgysmJHNpqI4hDnFLUFlw-1; Wed, 26 Aug 2020 09:06:43 -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 D7D8B189E606 for ; Wed, 26 Aug 2020 13:06:42 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 565D960C0F; Wed, 26 Aug 2020 13:06:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598447205; 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=uNK5jhcbpw5zyWw+KpnINndLmxU5aXnh7v/dKW/pb7I=; b=dy+xWQdmXNxxrYEP3k57LPmXbzdaB61BEp6xbeyMimmWCbSZ9Gbm+Mhe9JEvUWjKXIiZq8 eFc+BeVRW0CW7nkpnPlpM4vL6KtVbl4B0KqyIYqhyq8OWTUh8gad1BFlZdMMt3mQDbBRv1 ibsgRd1KMv+c1/uqwTeYbHyW3H4CjHY= X-MC-Unique: bEgysmJHNpqI4hDnFLUFlw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 2/6] meson: install scripts/qemu-trace-stap Date: Wed, 26 Aug 2020 17:06:18 +0400 Message-Id: <20200826130622.553318-3-marcandre.lureau@redhat.com> In-Reply-To: <20200826130622.553318-1-marcandre.lureau@redhat.com> References: <20200826130622.553318-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=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-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: pbonzini@redhat.com, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- Makefile | 3 --- meson.build | 1 + scripts/meson.build | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 scripts/meson.build diff --git a/Makefile b/Makefile index 16b2ffa7fe..058cf87f54 100644 --- a/Makefile +++ b/Makefile @@ -244,9 +244,6 @@ ICON_SIZES=3D16x16 24x24 32x32 48x48 64x64 128x128 256x= 256 512x512 # Needed by "meson install" export DESTDIR install: all install-datadir install-localstatedir -ifdef CONFIG_TRACE_SYSTEMTAP - $(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir) -endif for s in $(ICON_SIZES); do \ mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \ $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \ diff --git a/meson.build b/meson.build index f0fe5f8799..6bd66243ee 100644 --- a/meson.build +++ b/meson.build @@ -1123,6 +1123,7 @@ if have_tools endif endif =20 +subdir('scripts') subdir('tools') subdir('pc-bios') subdir('tests') diff --git a/scripts/meson.build b/scripts/meson.build new file mode 100644 index 0000000000..e8cc63896d --- /dev/null +++ b/scripts/meson.build @@ -0,0 +1,3 @@ +if 'CONFIG_TRACE_SYSTEMTAP' in config_host + install_data('qemu-trace-stap', install_dir: get_option('bindir')) +endif --=20 2.26.2 From nobody Sat May 18 22:14:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598447296; cv=none; d=zohomail.com; s=zohoarc; b=CW5EQp349IioPqluUp+YsPwdsvDrT4Zwj4cf0dBeYsRSybXso1h63yVskCXl8DUwgZOCZdmYp8Hap/CKPScDyXnDAz7ftoGCkdNfVSCJ8kFCwLTRpOvzGH9hff7i8drYcgfuav4sKhU/JKRet3o7O42NhQ36PU9tiNvhpM+0eso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598447296; 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=UxFM8erN8k/+Udtv4n/cFZI1W9WScbQ6ERemaUaVSg8=; b=ZmYYxZUV6sINc0Z62Ex4ZHH3IpQvjC5iT4TeTcM8JDcjhRcF3tXZMYDc1XTiytABIof5PRCbb0AvE+UZ2Lmd8pW2oAiKl0RTBi78eeoWbkrpYDX1rxc9Eqm7nDprrVORuTiW/rzZsrQOJsNGUqUYfkDx95MIMOXLpeUYbsDaUx8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 159844729685450.870127821391975; Wed, 26 Aug 2020 06:08:16 -0700 (PDT) Received: from localhost ([::1]:53636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAv9z-0005wx-JX for importer@patchew.org; Wed, 26 Aug 2020 09:08:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAv8i-0004RS-9N for qemu-devel@nongnu.org; Wed, 26 Aug 2020 09:06:56 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:32543 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 1kAv8g-0002Ee-Lk for qemu-devel@nongnu.org; Wed, 26 Aug 2020 09:06:55 -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-459-tXDK1_1PMB6E1UqS6Hf29g-1; Wed, 26 Aug 2020 09:06:51 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EBFEF10ABDBC for ; Wed, 26 Aug 2020 13:06:50 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7AFF65D9E4; Wed, 26 Aug 2020 13:06:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598447213; 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=UxFM8erN8k/+Udtv4n/cFZI1W9WScbQ6ERemaUaVSg8=; b=OnpI3XXpNcrColnn5oHIc4Ya0RqUwF71m6RIakMhuZcc3ZQhQaXZT1YTzuDgMjOHA2rLcs jY4tGh58DQn1nIpmZ8dMcAMsvI30ctPVdrKA6NZDTF0aLvYkHUvCCZvjq0Nex3G7bh+j/9 eEN3D5n4kB/q+8nZmmB9LwToZAoFqfg= X-MC-Unique: tXDK1_1PMB6E1UqS6Hf29g-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 3/6] meson: install icons Date: Wed, 26 Aug 2020 17:06:19 +0400 Message-Id: <20200826130622.553318-4-marcandre.lureau@redhat.com> In-Reply-To: <20200826130622.553318-1-marcandre.lureau@redhat.com> References: <20200826130622.553318-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.120; 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:56:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: pbonzini@redhat.com, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- Makefile | 12 ------------ ui/icons/meson.build | 13 +++++++++++++ ui/meson.build | 1 + 3 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 ui/icons/meson.build diff --git a/Makefile b/Makefile index 058cf87f54..d1a3cd77a5 100644 --- a/Makefile +++ b/Makefile @@ -239,22 +239,10 @@ ifeq ($(CONFIG_GUEST_AGENT),y) endif endif =20 -ICON_SIZES=3D16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 =20 # Needed by "meson install" export DESTDIR install: all install-datadir install-localstatedir - for s in $(ICON_SIZES); do \ - mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \ - $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \ - "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \ - done; \ - mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps"; \ - $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_32x32.bmp \ - "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \ - mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps"; \ - $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu.svg \ - "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps/qemu.svg" mkdir -p "$(DESTDIR)$(qemu_desktopdir)" $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" diff --git a/ui/icons/meson.build b/ui/icons/meson.build new file mode 100644 index 0000000000..b6e21f6ad7 --- /dev/null +++ b/ui/icons/meson.build @@ -0,0 +1,13 @@ +foreach s: [16, 24, 32, 48, 64, 128, 256, 512] + s =3D '@0@x@0@'.format(s.to_string()) + install_data('qemu_@0@.png'.format(s), + rename: 'qemu.png', + install_dir: config_host['qemu_icondir'] / 'hicolor' / s / = 'apps') +endforeach + +install_data('qemu_32x32.bmp', + rename: 'qemu.bmp', + install_dir: config_host['qemu_icondir'] / 'hicolor' / '32x32= ' / 'apps') + +install_data('qemu.svg', + install_dir: config_host['qemu_icondir'] / 'hicolor' / 'scala= ble' / 'apps') diff --git a/ui/meson.build b/ui/meson.build index 018c5698bf..0b937e4455 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -110,5 +110,6 @@ if have_system or xkbcommon.found() endif =20 subdir('shader') +subdir('icons') =20 modules +=3D {'ui': ui_modules} --=20 2.26.2 From nobody Sat May 18 22:14:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598447371; cv=none; d=zohomail.com; s=zohoarc; b=kHHLZ2Js9ddSRL0bidUDxBo8EZP0KeGZlZ7g8Y3cV/BU1c7b+Tr5rExFvN9Ofs4pmWhWrHi8i82NZ4KfwfyOyhHSg8TdBRgrTDJJgndoQ0cQCrLDJqzWpQaukhIUjz/wOdxMYf01IwBtrY9zxusENOmQn+L/RoXpCZOPiqCjLNI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598447371; 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=YrnmHzhRQ6yNR8uqu1QH4j9dm0S6OEtjrlBjHYHsQy8=; b=PR3dxTlPyNz+2zAa1dz4gBP0v0duiPp2oYh5bzjM5mdTWRYppF9rqiYjeQkYbUFu1BQzLw/0XVVYgNbbgmpUXNA/t4zkye/U9Aoo/aGpUemMfMFPMzS1wuIfRkc1RuvEqD8p/z/1GuevYJgpwHzhJBiyixgZvh0qTLErHzN2Vyw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1598447371516450.55552358653983; Wed, 26 Aug 2020 06:09:31 -0700 (PDT) Received: from localhost ([::1]:60072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAvBB-00005n-8L for importer@patchew.org; Wed, 26 Aug 2020 09:09:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAv8p-0004YS-EW for qemu-devel@nongnu.org; Wed, 26 Aug 2020 09:07:03 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:32824 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 1kAv8n-0002Er-Pl for qemu-devel@nongnu.org; Wed, 26 Aug 2020 09:07:03 -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-335-BkgdhoteMP6d503lS2_Gsw-1; Wed, 26 Aug 2020 09:06:59 -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 C1985AE400 for ; Wed, 26 Aug 2020 13:06:58 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BF155C1C4; Wed, 26 Aug 2020 13:06:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598447221; 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=YrnmHzhRQ6yNR8uqu1QH4j9dm0S6OEtjrlBjHYHsQy8=; b=KKFSgxNwmYE+XXAj/oGQ2mFlTYR2tMGKHXw5jdt0SVCrJWYZrQIkPqmQFiVtWw29RvoMaY dnZHphLDZnLKnkM3bFcEgHKDfiQYCLzTVEFdIja8/1wWDmW8sBDGWl5QWiwnSHjoZ8iRt1 GA/rp30ywgegh9h8PVZosNYEIrE+d2Q= X-MC-Unique: BkgdhoteMP6d503lS2_Gsw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 4/6] meson: install desktop file Date: Wed, 26 Aug 2020 17:06:20 +0400 Message-Id: <20200826130622.553318-5-marcandre.lureau@redhat.com> In-Reply-To: <20200826130622.553318-1-marcandre.lureau@redhat.com> References: <20200826130622.553318-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=207.211.31.120; 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:56:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: pbonzini@redhat.com, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- Makefile | 3 --- ui/meson.build | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d1a3cd77a5..dc3c20dd5e 100644 --- a/Makefile +++ b/Makefile @@ -243,9 +243,6 @@ endif # Needed by "meson install" export DESTDIR install: all install-datadir install-localstatedir - mkdir -p "$(DESTDIR)$(qemu_desktopdir)" - $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ - "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" =20 ifdef CONFIG_WIN32 diff --git a/ui/meson.build b/ui/meson.build index 0b937e4455..e963c9e525 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -112,4 +112,6 @@ endif subdir('shader') subdir('icons') =20 +install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir']) + modules +=3D {'ui': ui_modules} --=20 2.26.2 From nobody Sat May 18 22:14:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598447311; cv=none; d=zohomail.com; s=zohoarc; b=a17/QQeVgqhCkYo+Hlnj4KM3wkzaqrxmaqs8YuCIJl/xGm4TXtYjqwVRwabDnLUvxwnUKhniUT+UE7Nr6UZeNUIwxzz1zyH1FouLOruNhHi/NJajblXwUg4UCUFnTTrK83ySH/anAXXDekeDnGBCEgcBbDQyo/P0gE7rp0wjhuQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598447311; 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=R1bixWs7YawKmc1KBJbS3ohcGUCnPIAUu2VpF9JtO9Y=; b=bS4pgrey66ewAoYt18pXpz0pnycCSJhA7121QnL4VzHEM9UpAg6mHBAVSEoMKdaDg95VrZ/ZKq7HhMdL1rDfHKLpByo1Pc0H9nBee2LV5DJJO3OQJUl5VvdOQt/+N1wCiR4qImLZUJ2pAi8kpQGj1wVJkde+tpuMpZDvCxv80U0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1598447311422190.91050101499889; Wed, 26 Aug 2020 06:08:31 -0700 (PDT) Received: from localhost ([::1]:54818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAvAE-0006RH-4C for importer@patchew.org; Wed, 26 Aug 2020 09:08:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAv8w-0004nN-1U for qemu-devel@nongnu.org; Wed, 26 Aug 2020 09:07:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:32597) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAv8u-0002FK-9l for qemu-devel@nongnu.org; Wed, 26 Aug 2020 09:07:09 -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-334-u0GbR078MNyhA57AMcq3tA-1; Wed, 26 Aug 2020 09:07:05 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 89B1D10ABDBC for ; Wed, 26 Aug 2020 13:07:04 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 253385D9E8; Wed, 26 Aug 2020 13:07:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598447227; 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=R1bixWs7YawKmc1KBJbS3ohcGUCnPIAUu2VpF9JtO9Y=; b=Cg+wp7B12GOWBH9e99nC3cvhOrENFaGWt4qTGFXgiEYNnVEFYYsJTl18AzLh21qAtJ6xFv Sv3RPK3msdE/actyYYDZ4OjxQsXlDnAoodX3U0ZW62K89mfBkkl9P6VSbSgEMDUXTVdNKY nG6ehzMxICVvJruKL3HsaOIYkm6RSQg= X-MC-Unique: u0GbR078MNyhA57AMcq3tA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 5/6] meson: install $localstatedir/run for qga Date: Wed, 26 Aug 2020 17:06:21 +0400 Message-Id: <20200826130622.553318-6-marcandre.lureau@redhat.com> In-Reply-To: <20200826130622.553318-1-marcandre.lureau@redhat.com> References: <20200826130622.553318-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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=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-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: pbonzini@redhat.com, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- Makefile | 10 +--------- qga/meson.build | 2 ++ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index dc3c20dd5e..9a9e7c0301 100644 --- a/Makefile +++ b/Makefile @@ -232,17 +232,9 @@ distclean: clean ninja-distclean install-datadir: $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)" =20 -install-localstatedir: -ifdef CONFIG_POSIX -ifeq ($(CONFIG_GUEST_AGENT),y) - $(INSTALL_DIR) "$(DESTDIR)$(qemu_localstatedir)"/run -endif -endif - - # Needed by "meson install" export DESTDIR -install: all install-datadir install-localstatedir +install: all install-datadir $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" =20 ifdef CONFIG_WIN32 diff --git a/qga/meson.build b/qga/meson.build index 3f28f74b52..e5c5778a3e 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -82,6 +82,8 @@ if targetos =3D=3D 'windows' all_qga +=3D [qga_msi] alias_target('msi', qga_msi) endif +else + install_subdir('run', install_dir: get_option('localstatedir')) endif =20 alias_target('qemu-ga', all_qga) --=20 2.26.2 From nobody Sat May 18 22:14:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598447418; cv=none; d=zohomail.com; s=zohoarc; b=SXHYkLQHsWHKFBhy21mDE1pRK9F5qQeoZ8zdJieBUaP651DFWvubTQXtYW3lf23ESLAEMygEk7iKphbeM/5C/cYyPutOGoLSMcGcBYmcKEzA9PzQWCszLKJwAER8O4cWGqvimSGpLzM4NxPiBvTcOC3MPDsQFY1eUFcrKt1nKK4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598447418; 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=93r3xopRd/4+ask6J7CZEtbhuCGYBv3KRMEHpGvj3Q8=; b=FDT66kWkNgiQSKPI3KSnAdf0MpaFLj02WfwjBdHE99kl9gMlyZN/V+HmmarrqaVfdjYN4WyzrEXjvabh/tuil2qFuPT+dTf4wPYqPbY+txi45oMjN75EHfE+37Uu7n/S9xhgXHV0r/ocX3A3s3WrU12s8QOjQRcw4SbOButZfQc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1598447418728339.3120731813789; Wed, 26 Aug 2020 06:10:18 -0700 (PDT) Received: from localhost ([::1]:35080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAvBx-0001Pd-Hs for importer@patchew.org; Wed, 26 Aug 2020 09:10:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAv93-00057Q-Dz for qemu-devel@nongnu.org; Wed, 26 Aug 2020 09:07:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52449) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAv91-0002Ff-OZ for qemu-devel@nongnu.org; Wed, 26 Aug 2020 09:07:17 -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-519-GyBHZbNOMK-UGP9cAvei8Q-1; Wed, 26 Aug 2020 09:07:12 -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 F26CC10ABDD1 for ; Wed, 26 Aug 2020 13:07:11 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 54B1819C78; Wed, 26 Aug 2020 13:07:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598447234; 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=93r3xopRd/4+ask6J7CZEtbhuCGYBv3KRMEHpGvj3Q8=; b=iAF8KTNS3cVFx1tKWpv4A4Xyg34i9cJROh8GS6h0bq02dOOSZHSGQdxFxyYYzZfmDnyKEf 3i87XNYqmR5HSCf9EwYOLmYSNx0PdGu3Zux+L/olxn/KOeT5btCI+GGLY6jkUTj4Bzvj81 P3Vf5mwK5OhQRpM3jP1Pe5EMolnkFTA= X-MC-Unique: GyBHZbNOMK-UGP9cAvei8Q-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 6/6] build-sys: remove install target from Makefile Date: Wed, 26 Aug 2020 17:06:22 +0400 Message-Id: <20200826130622.553318-7-marcandre.lureau@redhat.com> In-Reply-To: <20200826130622.553318-1-marcandre.lureau@redhat.com> References: <20200826130622.553318-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.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-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: pbonzini@redhat.com, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Now covered by meson Signed-off-by: Marc-Andr=C3=A9 Lureau --- Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Makefile b/Makefile index 9a9e7c0301..75db8be52e 100644 --- a/Makefile +++ b/Makefile @@ -229,13 +229,8 @@ distclean: clean ninja-distclean rm -f linux-headers/asm rm -Rf .sdk =20 -install-datadir: - $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)" - # Needed by "meson install" export DESTDIR -install: all install-datadir - $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" =20 ifdef CONFIG_WIN32 =20 --=20 2.26.2