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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47934C76188 for ; Tue, 23 Jul 2019 07:02:40 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1EE2E21911 for ; Tue, 23 Jul 2019 07:02:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1EE2E21911 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpoop-0006nA-2p for qemu-devel@archiver.kernel.org; Tue, 23 Jul 2019 03:02:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35702) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpooe-0006Ou-Vw for qemu-devel@nongnu.org; Tue, 23 Jul 2019 03:02:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpood-0008V2-La for qemu-devel@nongnu.org; Tue, 23 Jul 2019 03:02:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58588) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpood-0008Ua-Ga for qemu-devel@nongnu.org; Tue, 23 Jul 2019 03:02:27 -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 mx1.redhat.com (Postfix) with ESMTPS id 7FB2D30BD1B6; Tue, 23 Jul 2019 07:02:26 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-56.brq.redhat.com [10.40.204.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8443B19C58; Tue, 23 Jul 2019 07:02:20 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 23 Jul 2019 09:02:18 +0200 Message-Id: <20190723070218.3606-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 23 Jul 2019 07:02:26 +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 v2] NSIS: Add missing firmware blobs 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: Stefan Weil , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Various firmwares has been added in the pc-bios/ directory: - CCW (since commit 0c1fecdd523) - skiboot (since commit bcad45de6a0) - EDK2 (since commit f7fa38b74c3) Since we install qemu-system able to run the architectures targetted by these firmware, include them in the NSIS exe. Reviewed-by: Stefan Weil Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: Add *.ndrv, update the Uninstall section (Stefan) --- qemu.nsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qemu.nsi b/qemu.nsi index 75f1608b9e..d0df0f4e3a 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -106,6 +106,9 @@ RequestExecutionLevel admin ;-------------------------------- =20 ; The stuff to install. +; +; Remember to keep the "Uninstall" section in sync. + Section "${PRODUCT} (required)" =20 SectionIn RO @@ -122,6 +125,10 @@ Section "${PRODUCT} (required)" File "${BINDIR}\*.bmp" File "${BINDIR}\*.bin" File "${BINDIR}\*.dtb" + File "${BINDIR}\*.fd" + File "${BINDIR}\*.img" + File "${BINDIR}\*.lid" + File "${BINDIR}\*.ndrv" File "${BINDIR}\*.rom" File "${BINDIR}\openbios-*" =20 @@ -210,6 +217,10 @@ Section "Uninstall" Delete "$INSTDIR\*.bin" Delete "$INSTDIR\*.dll" Delete "$INSTDIR\*.dtb" + Delete "$INSTDIR\*.fd" + Delete "$INSTDIR\*.img" + Delete "$INSTDIR\*.lid" + Delete "$INSTDIR\*.ndrv" Delete "$INSTDIR\*.rom" Delete "$INSTDIR\openbios-*" Delete "$INSTDIR\qemu-img.exe" --=20 2.20.1