From patchwork Wed Jul 17 13:43:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 169141 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp998127ilk; Wed, 17 Jul 2019 06:51:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqzmCHip0+Bp9vQP7rQeXahl1jJWie1iwr0FZvMi6dyKcmXWxNGfcnFjr8dN0xioHXRxhR92 X-Received: by 2002:a17:907:20bb:: with SMTP id pw27mr29033419ejb.93.1563371507878; Wed, 17 Jul 2019 06:51:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371507; cv=none; d=google.com; s=arc-20160816; b=aPrzUpVY7Z8BxRHI3sN3p1/GWCP3AM9z6e0hJaK37OWN0uiGnMD5RvaIhW+zCqaRfR L4NpSW/YnWSJi4I31QJhM/XbICbkm4Q27sfprOBmxuv9SFrqt3Rdr3UZhz04+Y3cHsEO EFI6YAtqI2yq3K0Dr7pjyIIANLyvdNYaG304EDUYoPin3gcEADuRTNHNvVWdJ97bJbOh bbTlotYrkOU9Xosuq0YwhcjjugxGxz2FI6SCNEWT/racYEQodeeMaAlROAKCDSgMVR0R u3yxwbcROMcnou1HIjze34F79DHmjR6kWp/iVWmHOhl3nkiemIt4Ir9PXqXmqGMyWyY8 z5rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=RSO5DITZZu7ifSyqioTQb5c3MVCyKp0cisQVozONBJA=; b=gy+qtUzHrZHkJDehBlZyEdPOZ01iiJig1K5FumSVKlPgn/JCaW1x68PqmbfemVIl1f 1EjfepjK2KsgW/tlGqZJVa6Ocd05l15+TqEhcv3ETR+aCQSFaCTyxMff6MD5ZeBotvDe amhRLJwHnwHdgvZrZ/MJHWzuNjMwEciXHwKVFp7YI6TEH7NMs7oIOBSO7uoDSbjt+oW5 FrW3534pKbOexE/Yq1Lc2BHoi4Ggg/Hm40cNaRxj21orKH5FK4H+DNYN4VBDvWz80fRd sbx0tCfB1IVQATNN8zfz2GUrXVfZNFZ6VJr9Ti19IPoVlJh5++XQLSP3ItCS4XI+LwHT vW7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AtB0JyaC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d21si12990878ejw.81.2019.07.17.06.51.47 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:51:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AtB0JyaC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkLS-0006aI-Bk for patch@linaro.org; Wed, 17 Jul 2019 09:51:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57809) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKf-0004XG-J3 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKe-00011s-E0 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:57 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:53856) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKe-00011F-7K for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:56 -0400 Received: by mail-wm1-x336.google.com with SMTP id x15so22257009wmj.3 for ; Wed, 17 Jul 2019 06:50:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RSO5DITZZu7ifSyqioTQb5c3MVCyKp0cisQVozONBJA=; b=AtB0JyaCda6TltsaRVl4uiyveUz/np9FIz9Kkze+bxXbieJz09WCSrmb3sc7pcNpTc 0rm8YGivuX6mfhNTRmy6HVy2tGWAGj6YwWpVYY2ECunl2g1q8Xv2V1xzCTpBgbmLXZK8 HXOqk/e5PCKVp4y1yG7pRI5nsnbpkzoQVyah61X4k3Bcr45LiZwmoJKSanYzhbY/IY7r +o2qYQxw71pfftvEt8mulujnsdA1bhjML4kxSn6Jkt+IOPtKL6PwwpPahYfHEMOK+Lew wITRiG9iBk2J84yakUIbziwbmXNiy6SNR6TJorlr86pXT1nFp3VzdhqikID7wknh57hV smiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RSO5DITZZu7ifSyqioTQb5c3MVCyKp0cisQVozONBJA=; b=fmnAC4A6l6leBqbvczi+iF+VCmm4F6hjLL2QLblbDIMZiCU2dKo0hQdjJwb8OuzqvW Du+vRYRflyVO1y9yCz1A9rYB6DoU6mC5PQSoSaxTkEkBsEtGEXG/jPlH1Nh9cLtNgDH+ /syIwV1ruTZ3y/KiqEzhJXBLwld/JPSDPGnB4V3xJX8p7s7k/S6KvjiMAIa6g6INRjad DF5/XFgZfQzH0tGElNIP4fKzUFxQLF5lZb2w0XOXqMoAqrur56U55+njvtQOyQGW2D83 zcYnAEfMeUdg7FgPzDpmLQ2IPIh52zwOnmANO6IxjmtotcOa2305QHtsid+a4I7ka5qU E/lQ== X-Gm-Message-State: APjAAAU75QMHbkW5i2681+ktlpG54+V5rQ9Db8Rjbx0d0jtGEMbXxJ8F jGJ4X2hZ6O4pjbeaPC7hBJqYZQ== X-Received: by 2002:a1c:cb0a:: with SMTP id b10mr36500299wmg.41.1563371455051; Wed, 17 Jul 2019 06:50:55 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s2sm20145925wmj.33.2019.07.17.06.50.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1F6BA1FF9D; Wed, 17 Jul 2019 14:43:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:26 +0100 Message-Id: <20190717134335.15351-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 Subject: [Qemu-devel] [PATCH v2 14/23] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed 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: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé 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=${i%.exe}; \ arch=${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="y" \ \ -DBINDIR="/tmp/qemu-nsis" \ \ -DSRCDIR="/home/phil/source/qemu" \ -DOUTFILE="qemu-setup-4.0.90.exe" \ -DDISPLAYVERSION="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=outfile 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é Message-Id: <20190715174817.18981-8-philmd@redhat.com> Signed-off-by: Alex Bennée --- Makefile | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/Makefile b/Makefile index 5a462629370..f3866ee084c 100644 --- a/Makefile +++ b/Makefile @@ -762,6 +762,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 \