From patchwork Tue Jul 23 10:36:05 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: 169511 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8708468ilk; Tue, 23 Jul 2019 03:42:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqw3n3O3uo763AbU6SrJfIO/lv7foX1/PXLypSRZiywH1ZO9aZJJd2krtsbvh1uEJOhDR4vL X-Received: by 2002:a0c:f952:: with SMTP id i18mr39945298qvo.205.1563878577896; Tue, 23 Jul 2019 03:42:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878577; cv=none; d=google.com; s=arc-20160816; b=IPdrfcYXRSqTXVergXjYAPD51fh11IG6HbBX75SW/ntHNmYf3x4FnNT4ojWv9XnL9a uiELSt/F0m35EY+kc8tp+UFNGBkExMexTbClDTa6EUA0TJ3jkwDf1cKzAGQJXgCVBqxU oRujxuFPjSuM8vXKKJcT52P1tBNTzZIod050Q9VfNyx5BKjcyeUTOcqCqwIrBy4OLwCO SzT/LqowrxUyzsM0XGKv0JVELmsv3vFnZ98J/q/YsQdlBwgBc0qgXz0zjhZ8YEKwMEXv PsSo1sqnVM2pvb/iqigmcZhp+zgm8fug02HGtNNjDLtPKMSQmCD/lB531KvEDQv3CWWP DoRQ== 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=/n1rEaje2BoVXSJBN759/udEouiZ9f4YQb0qSuBt+/w=; b=HtijE/JPGXzrdn7H1iNRLv++2y1TucvrKmzBzTWNjrV4GW8z16/YgFblEFhfmhre3l 531+tIKXs+8x0hqaAUSNFtDzukOFJjW9HZhKTGmXw5oZRtNN8DuhlOlFDSPAskM/i3PB dloUkOTCLGlwoYwmapvCp9O8WvHVyw0iuWZY+X5s1SscxcLf6fLNS1Ww2j/V3knH0r8g /Aci2tpFxT42kaK8zwbPMSflUHUEoMheZ7L+++s29UX9zqa0NfPaxZlxfSU8+0gRp6rp FfZdd5htxAZpiDi56Zkd3a58B4mhnxHBR3tKdNvHRc6K1m7rW9tbLEOBaMf4hZSo6tSX LNDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AJd0PXY3; 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 m9si26347921qke.19.2019.07.23.03.42.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:42:57 -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=AJd0PXY3; 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]:41102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsG0-0006K4-Ls for patch@linaro.org; Tue, 23 Jul 2019 06:42:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39768) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsFA-0002rr-60 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsF8-0004NG-3T for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:04 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:33350) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpsF5-0004A4-UJ for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:00 -0400 Received: by mail-wm1-x331.google.com with SMTP id h19so30817641wme.0 for ; Tue, 23 Jul 2019 03:41:53 -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=/n1rEaje2BoVXSJBN759/udEouiZ9f4YQb0qSuBt+/w=; b=AJd0PXY3+S6kHTbr38KSv9v8VAhnYMViYI3ig4eOV0zwu8+J4FdY950E5BCLX+pWNN WQ/EqJLh2Wk7A0aGoMEE/ne54degGOwRD3Nq1FOarCbHxd2eVhFvVCFHt1xUNqZ7pCN5 gcJ7UnuHVqjSPt2KLBf8G2rNygFjg4N8OI/aHhAkkIh+DzOtwa27JT1UQsGD3vQwIIxW DyalNHd/TVt6zZ2YmTaif33r91HrGp/TklSRtDvZpGa7oHZGxmTYVrhKuMQESCT606Co 9V2mmamO4n1lAtqDL4CrWpi0FsXRcofAjw9Wki6usuHY9J2vDCdJD79Hb7ZEOQhAOdav z1Og== 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=/n1rEaje2BoVXSJBN759/udEouiZ9f4YQb0qSuBt+/w=; b=OaKwpmF/qSJKcAWtZuH33RTYV3Nw2hWph4UAkvSgVRK7RVrmz9TJH3G30PeZZzIXZA HbNyZO8CEhkhZYn6evooPeySqR1GdCdPqt0oO1wrgEuoSFsiwNoDMPzCLzOXA6kcAigJ BoNbm1d+Lkp11Eu1d2PXo6nxqqnZaH6URNEQtWHZAFNiHHP5EK2r4OGjTlcoxV7t6zRe O+J1JSlKWczrw1hYrguwHv445Js+ek86xkBUuoDFkerIVoc9qTIVBahSteL54hx4TqAl cluK2gpQs+qSMKk1E6UlcwqOebMIGbzBbmBEMmlT4B99RSnbSYrnB1KOgb9eSBDV8FNn KO9w== X-Gm-Message-State: APjAAAX8QMjxA5PGuJ0UO039vM82frP7GncojJnDc41J01FofjqDdOgD YmOyVZ5RnR3Z4nNtzUuhw3uKYw== X-Received: by 2002:a05:600c:225a:: with SMTP id a26mr72127529wmm.81.1563878512827; Tue, 23 Jul 2019 03:41:52 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 2sm54886497wrn.29.2019.07.23.03.41.49 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:41:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C61BD1FF9F; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:05 +0100 Message-Id: <20190723103612.5600-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-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::331 Subject: [Qemu-devel] [PULL 16/23] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé 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é Message-Id: <20190723070218.3606-1-philmd@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/qemu.nsi b/qemu.nsi index 75f1608b9e0..d0df0f4e3a1 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -106,6 +106,9 @@ RequestExecutionLevel admin ;-------------------------------- ; The stuff to install. +; +; Remember to keep the "Uninstall" section in sync. + Section "${PRODUCT} (required)" 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-*" @@ -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"