From nobody Fri May 3 14:28:35 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1563037173; cv=none; d=zoho.com; s=zohoarc; b=OzpMC2UYMMN5pcgSnB0ALUYSm8hbghnkXhPVjfYfmgaQFXY4HXU0GfJoW+nG6GnTQcWwA3vx5A7n6eP+h1pHtOm29PGKqvtRJVA9OhiPeW7f/aCvcJy1U6Q+eeRpI/HVvljzU4B2c+IN8UwplWj/PxPd45ljusqv8u6QO99Pgr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563037173; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=RGlVOmZYocRZlq853yHDSwymNqJdQULk81DTLt3n0TY=; b=nR2eDx8koXg5L+U69XN/Dlj02Dko8jR4c0DeeNN/uq1aWxC1VV04jHw3uQOEjJOp+Spd6c0v7VnlQZPCoTc+cEXCr5+3LH+HUz55Gehp0LbBEcmlN5WJiBYCGb3OESFzZsEG7LlkIBXqeSbs+YxwKOqQmQtC0UaccIpS2rl0U4E= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563037173327804.6810046619198; Sat, 13 Jul 2019 09:59:33 -0700 (PDT) Received: from localhost ([::1]:57388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmLMq-0002Ij-Id for importer@patchew.org; Sat, 13 Jul 2019 12:59:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59374) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmLMf-0001v1-N2 for qemu-devel@nongnu.org; Sat, 13 Jul 2019 12:59:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmLMd-0002MW-PR for qemu-devel@nongnu.org; Sat, 13 Jul 2019 12:59:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58294) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hmLMd-0002Jo-Iv for qemu-devel@nongnu.org; Sat, 13 Jul 2019 12:59:11 -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 mx1.redhat.com (Postfix) with ESMTPS id C08C38110E; Sat, 13 Jul 2019 16:59:06 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-24.brq.redhat.com [10.40.204.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E02665DA34; Sat, 13 Jul 2019 16:58:59 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Sat, 13 Jul 2019 18:58:56 +0200 Message-Id: <20190713165856.29883-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Sat, 13 Jul 2019 16:59:06 +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] [RFC PATCH-for-4.1] Makefile: Fix the NSIS Windows builds 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: Fam Zheng , Adam Baxter , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The qemu-nsis.bmp file was not listed with the other blobs, thus not installed in the ${BINDIR} location. This fixes: $ make installer [...] (cd /tmp/qemu-nsis; \ 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 \ ) >/tmp/qemu-nsis/system-emulations.nsh makensis -V2 -NOCD \ -DCONFIG_DOCUMENTATION=3D"y" \ \ -DBINDIR=3D"/tmp/qemu-nsis" \ \ -DSRCDIR=3D"/home/phil/source/qemu" \ -DOUTFILE=3D"qemu-setup-4.0.90.exe" \ -DDISPLAYVERSION=3D"4.0.90" \ /home/phil/source/qemu/qemu.nsi File: "/tmp/qemu-nsis\*.bmp" -> no files found. Usage: File [/nonfatal] [/a] ([/r] [/x filespec [...]] filespec [...] | /oname=3Doutfile one_file_only) Error in script "/home/phil/source/qemu/qemu.nsi" on line 122 -- aborting= creation process Makefile:1077: recipe for target 'qemu-setup-4.0.90.exe' failed make: *** [qemu-setup-4.0.90.exe] Error 1 Fixes: https://bugs.launchpad.net/bugs/1836453 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- Based-on: 20190713163558.13204-1-philmd@redhat.com https://lists.gnu.org/archive/html/qemu-devel/2019-07/msg03204.html $ file qemu-setup-4.0.90.exe qemu-setup-4.0.90.exe: PE32 executable (GUI) Intel 80386 (stripped to exter= nal PDB), for MS Windows, Nullsoft Installer self-extracting archive --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 1fcbaed62c..de4dfa2214 100644 --- a/Makefile +++ b/Makefile @@ -761,6 +761,7 @@ 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 \ --=20 2.20.1