From patchwork Tue Jul 23 10:36:03 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: 169507 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8707748ilk; Tue, 23 Jul 2019 03:42:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqxXsaIEFlY4w40FVZaG1JGs0iGYnBgPFihUqD8b3m4nv7VpsTfBCbVRno9H8Zksg3BjbI7y X-Received: by 2002:a05:620a:14ba:: with SMTP id x26mr49654997qkj.328.1563878528021; Tue, 23 Jul 2019 03:42:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878528; cv=none; d=google.com; s=arc-20160816; b=NxMJGA10+eBuFlFMUdMcuvD9Edlni/UTAZXaKN0YSP5SWI8nbsb4bPsEmto7QoPMn1 4cJDDBHeNWKX6rJB9H76s5W1zqpKK7Qbo45y2ElLSihpgeeLbkVOn7Uqj8Is84VEScVc xdNVJ5J+vyAt8LvtC38Fw6b7/ywbZme0v4JiV7xpt7189rvZAl6e4e9599x1iChMOs6v t2IYSFXPPrgJE96+e+XIcXPE9BZGfQV/sSmiD+9hG+oh5fq4dxhD7zFw8+EOhcJ2jOac lJnF3SsbPWZ2ae1dVBNu2Jobq035mcIhqlphrH5gDZmL6G4IEnsG9oqSTpZnqX5pHVpg XtGA== 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=GDOlQg2avM3U9x1HQrrYCutc2wv4Hz+Sy22dYaJ+OrY=; b=DkAiAnXWFr0UOusqWLQOSUkfp0VCKU0Io/9KduT6/3B8e0t7wY6LBnmYP3UTk9/OLR zbsh85VHYqTNrSrzhewWGzfo36X6BveOmjldB6x3BmC4YmcZ7SLKYS0LyfAAyLV1+Lsx SobnwDxeWCIJIPc7K55CdNti9S04qI0AWlc3/MMIGs3Cye17vaH9BzYaOLisFem8ViK9 w9+OC/9G9rJANwDIWJBb3x7DS54WTk1vcQBD3N4WC28TFhg69C94AAmMKqdvAPYFx9Je 0+7SAi269R4MtmkwDBnRKvHRxxihhNdH7m4odTF/VQVffAMkTf2YNiKbf22pW2MTpGRZ PPxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MD+YroMo; 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 s190si9708559qkh.220.2019.07.23.03.42.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:42:08 -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=MD+YroMo; 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]:41074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsFC-0002iZ-SX for patch@linaro.org; Tue, 23 Jul 2019 06:42:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39673) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsF4-0002PH-1m for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsF1-0004CX-R6 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:57 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:47022) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpsEz-00048f-Nw for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:55 -0400 Received: by mail-wr1-x434.google.com with SMTP id z1so42591809wru.13 for ; Tue, 23 Jul 2019 03:41:51 -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=GDOlQg2avM3U9x1HQrrYCutc2wv4Hz+Sy22dYaJ+OrY=; b=MD+YroMoTvLg413MMnloRkdiOW2Sh/wBORPDJu3ueOvdzpvgPV10qrp1dhHKYTIgaN Wog4FjNH2GFM9jy/y9se/fqQxqaLQldQOJ5jhwZAqX6WkEpl8R3LFbGHShRK+7MNxmel pRWNACFV2nVxyhObSjZOKejg7kCrLa0ii+W67iwJ6OFWsJJqExIZNaDj9TKzO4iOXEcf zcT38xSDU4ASwrc95sg2Fh4m5M5Wz3zElr/94YEZhiry6Sg+0u/CB/VJW3m58lxXr76j 3T704B5su5rZay/fI1M4KoI8BKWRm0/ncZACGo3TB+etrn1XhKenadh5u/VZFTh89jPV a5fA== 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=GDOlQg2avM3U9x1HQrrYCutc2wv4Hz+Sy22dYaJ+OrY=; b=i/strnuMhwI1VtiWdHOar/zcaxqy9GnYx5j6DiSQFR6lGlmWPBUhDFYvLOsp3EeL+m QAANNvTIwbt/1Lxd91JDLdjfTfJsddo45T+UvgnId6ulk/pJL8gR1Ik8p06f8BErvVcC vFLjB55w+opPNe6MsqcUA0iuTOEfjfDAO/919ENkKR+qJLlh2xUy+UUpIJsqAovC3HGO 57Rk/sB1/TCNScPFtM6TKXu/neFzv92/CbNi+8D1xzUzo33A2a8sdC8ezDcgPWaWVT1J o/Qi31jPMBJP9Fl5I0YbRT96KKju2g1bwrFVG57Av/884lvpWkuZLlYCH6ya1AtIHwZL uwjg== X-Gm-Message-State: APjAAAXkwILygRBRAGUAYSexuMZGsRitSqSvTL9JBiEOWAA9THn0RbEB GBneAO2JgKe+dAS91Bf+6n1wbw== X-Received: by 2002:a5d:4211:: with SMTP id n17mr11293292wrq.137.1563878510848; Tue, 23 Jul 2019 03:41:50 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n5sm34368758wmi.21.2019.07.23.03.41.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:41:48 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9B2C11FF8C; 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:03 +0100 Message-Id: <20190723103612.5600-15-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::434 Subject: [Qemu-devel] [PULL 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?= , qemu-devel@nongnu.org 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 -- 2.20.1 diff --git a/Makefile b/Makefile index b3357691cad..cfab1561b9c 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 \