From nobody Fri Nov 7 18:33:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548762094584248.57845807010062; Tue, 29 Jan 2019 03:41:34 -0800 (PST) Received: from localhost ([127.0.0.1]:47791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goRli-0002xe-3e for importer@patchew.org; Tue, 29 Jan 2019 06:41:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39410) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goRk4-0001yO-8q for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goRk2-0001gq-8k for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53859) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goRk0-0001ai-7H for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:46 -0500 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 mx1.redhat.com (Postfix) with ESMTPS id 69C75445C4; Tue, 29 Jan 2019 11:39:29 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-66.ams2.redhat.com [10.36.112.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50B6C7E57F; Tue, 29 Jan 2019 11:39:26 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 29 Jan 2019 11:39:17 +0000 Message-Id: <20190129113921.21599-2-berrange@redhat.com> In-Reply-To: <20190129113921.21599-1-berrange@redhat.com> References: <20190129113921.21599-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 29 Jan 2019 11:39:29 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/5] nsis: don't install files into /tmp X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Baxter , Stefan Weil , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The nsis installer target has to run 'make install' to populate a directory tree with content for the package. Replace the current usage of '/tmp/qemu-nsis' with a location underneath the build directory. This ensures that when a developer cleans their build directory, any left over files from the installer build process are also purged. Signed-off-by: Daniel P. Berrang=C3=A9 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index de898eab62..362a98d275 100644 --- a/Makefile +++ b/Makefile @@ -907,7 +907,7 @@ endif .PHONY: installer installer: $(INSTALLER) =20 -INSTDIR=3D/tmp/qemu-nsis +INSTDIR=3D$(BUILD_DIR)/qemu-nsis-vroot =20 $(INSTALLER): $(SRC_PATH)/qemu.nsi $(MAKE) install prefix=3D${INSTDIR} --=20 2.20.1 From nobody Fri Nov 7 18:33:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548762234260380.4930541245682; Tue, 29 Jan 2019 03:43:54 -0800 (PST) Received: from localhost ([127.0.0.1]:47819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goRny-0004oe-4M for importer@patchew.org; Tue, 29 Jan 2019 06:43:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goRk4-0001yP-9N for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goRk2-0001h8-AK for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44982) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goRk0-0001az-89 for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:46 -0500 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 mx1.redhat.com (Postfix) with ESMTPS id AFE65C7E7E; Tue, 29 Jan 2019 11:39:31 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-66.ams2.redhat.com [10.36.112.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD7585D717; Tue, 29 Jan 2019 11:39:29 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 29 Jan 2019 11:39:18 +0000 Message-Id: <20190129113921.21599-3-berrange@redhat.com> In-Reply-To: <20190129113921.21599-1-berrange@redhat.com> References: <20190129113921.21599-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 29 Jan 2019 11:39:31 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/5] make: don't insert a '/' after $(DESTDIR) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Baxter , Stefan Weil , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This breaks when $(prefix) is a relative directory, as it turns it into an absolute path. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Eric Blake --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 362a98d275..14a463564e 100644 --- a/Makefile +++ b/Makefile @@ -744,19 +744,19 @@ ifneq ($(BLOBS),) done endif for s in $(ICON_SIZES); do \ - mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/$${s}/apps"; \ + 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"; \ + "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \ done; \ - mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/32x32/apps"; \ + 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"; \ + "$(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)" + "$(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" + "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" ifdef CONFIG_GTK $(MAKE) -C po $@ endif --=20 2.20.1 From nobody Fri Nov 7 18:33:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548762226263620.4370311168846; Tue, 29 Jan 2019 03:43:46 -0800 (PST) Received: from localhost ([127.0.0.1]:47817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goRno-0004er-9n for importer@patchew.org; Tue, 29 Jan 2019 06:43:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goRk5-0001z4-2f for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goRk4-0001ip-9Q for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53420) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goRk2-0001bf-8I for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:48 -0500 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 mx1.redhat.com (Postfix) with ESMTPS id 00B03C08733F; Tue, 29 Jan 2019 11:39:36 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-66.ams2.redhat.com [10.36.112.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id F24595D717; Tue, 29 Jan 2019 11:39:31 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 29 Jan 2019 11:39:19 +0000 Message-Id: <20190129113921.21599-4-berrange@redhat.com> In-Reply-To: <20190129113921.21599-1-berrange@redhat.com> References: <20190129113921.21599-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 29 Jan 2019 11:39:36 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/5] nsis: ensure we always pass -W64 flag to nsis installer script X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Baxter , Stefan Weil , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The code to set the -W64 flag is inside a conditional block that only executes when we are bundling DLLs with the installer. This results in QEMU being installed in the wrong location on 64-bit hosts when DLLs are not bundled. Signed-off-by: Daniel P. Berrang=C3=A9 --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 14a463564e..97a6727358 100644 --- a/Makefile +++ b/Makefile @@ -893,11 +893,14 @@ INSTALLER =3D qemu-setup-$(VERSION)$(EXESUF) =20 nsisflags =3D -V2 -NOCD =20 +ifeq ($(ARCH),x86_64) +nsisflags +=3D -DW64 +endif + 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 --=20 2.20.1 From nobody Fri Nov 7 18:33:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548762351675948.1272439648734; Tue, 29 Jan 2019 03:45:51 -0800 (PST) Received: from localhost ([127.0.0.1]:47886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goRpp-0006Ns-N0 for importer@patchew.org; Tue, 29 Jan 2019 06:45:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goRk6-0001zO-GR for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goRk4-0001jK-Fl for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47850) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goRk4-0001cP-7C for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:48 -0500 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 mx1.redhat.com (Postfix) with ESMTPS id 534018AE56; Tue, 29 Jan 2019 11:39:38 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-66.ams2.redhat.com [10.36.112.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FD531759E; Tue, 29 Jan 2019 11:39:36 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 29 Jan 2019 11:39:20 +0000 Message-Id: <20190129113921.21599-5-berrange@redhat.com> In-Reply-To: <20190129113921.21599-1-berrange@redhat.com> References: <20190129113921.21599-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 29 Jan 2019 11:39:38 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/5] nsis: fix location of icons to be bundled in the installer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Baxter , Stefan Weil , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The bmp icon files no longer exist in the root of the installation tree. Instead we must reference the new icons subdirectory location introduced in commit a8260d3876389eb52ca5c62ed4d80cdb7e025c85 Author: Daniel P. Berrang=C3=A9 Date: Thu Jan 10 12:00:45 2019 +0000 ui: install logo icons to $prefix/share/icons Reported-by: Adam Baxter Signed-off-by: Daniel P. Berrang=C3=A9 --- qemu.nsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu.nsi b/qemu.nsi index 75f1608b9e..53fd974877 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -119,12 +119,12 @@ Section "${PRODUCT} (required)" File "${SRCDIR}\README" File "${SRCDIR}\VERSION" =20 - File "${BINDIR}\*.bmp" File "${BINDIR}\*.bin" File "${BINDIR}\*.dtb" File "${BINDIR}\*.rom" File "${BINDIR}\openbios-*" =20 + File /r "${BINDIR}\icons" File /r "${BINDIR}\keymaps" !ifdef CONFIG_GTK File /r "${BINDIR}\share" @@ -206,7 +206,6 @@ Section "Uninstall" Delete "$INSTDIR\COPYING.LIB" Delete "$INSTDIR\README" Delete "$INSTDIR\VERSION" - Delete "$INSTDIR\*.bmp" Delete "$INSTDIR\*.bin" Delete "$INSTDIR\*.dll" Delete "$INSTDIR\*.dtb" @@ -217,6 +216,7 @@ Section "Uninstall" Delete "$INSTDIR\qemu.exe" Delete "$INSTDIR\qemu-system-*.exe" Delete "$INSTDIR\qemu-doc.html" + RMDir /r "$INSTDIR\icons" RMDir /r "$INSTDIR\keymaps" RMDir /r "$INSTDIR\share" ; Remove generated files --=20 2.20.1 From nobody Fri Nov 7 18:33:11 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548762098923271.58874182148645; Tue, 29 Jan 2019 03:41:38 -0800 (PST) Received: from localhost ([127.0.0.1]:47788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goRlf-0002vk-R0 for importer@patchew.org; Tue, 29 Jan 2019 06:41:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goRk2-0001wx-7H for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goRk0-0001fN-7J for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17493) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goRjz-0001dP-W9 for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:44 -0500 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 mx1.redhat.com (Postfix) with ESMTPS id 481FBC070E39; Tue, 29 Jan 2019 11:39:40 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-66.ams2.redhat.com [10.36.112.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id A680B1759E; Tue, 29 Jan 2019 11:39:38 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 29 Jan 2019 11:39:21 +0000 Message-Id: <20190129113921.21599-6-berrange@redhat.com> In-Reply-To: <20190129113921.21599-1-berrange@redhat.com> References: <20190129113921.21599-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 29 Jan 2019 11:39:40 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 5/5] configure: stop trying to link non-existant bmp file from bios dir X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Baxter , Stefan Weil , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The icons were all moved from pci-bios to ui/icons with: commit a8260d3876389eb52ca5c62ed4d80cdb7e025c85 Author: Daniel P. Berrang=C3=A9 Date: Thu Jan 10 12:00:45 2019 +0000 ui: install logo icons to $prefix/share/icons Adding symlinks from the source directory into the build directory for the new source location will not help QEMU to locate them when running uninstalled binaries, as we no longer search QEMU bios directory to locate icon files. Inability to find icons during startup when not having run a "make install" is harmless, as frontends just continue without error. So it is not worth trying to add code hacks to find icons in non-installed directories. Signed-off-by: Daniel P. Berrang=C3=A9 --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index b18281c61f..fb1f65958e 100755 --- a/configure +++ b/configure @@ -7617,7 +7617,6 @@ LINKS=3D"$LINKS pc-bios/optionrom/Makefile pc-bios/ke= ymaps" LINKS=3D"$LINKS pc-bios/spapr-rtas/Makefile" LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" LINKS=3D"$LINKS roms/seabios/Makefile roms/vgabios/Makefile" -LINKS=3D"$LINKS pc-bios/qemu-icon.bmp" LINKS=3D"$LINKS .gdbinit scripts" # scripts needed by relative path in .gd= binit LINKS=3D"$LINKS tests/acceptance tests/data" LINKS=3D"$LINKS tests/qemu-iotests/check" --=20 2.20.1