From patchwork Wed Jul 17 13:43:22 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: 169132 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp991224ilk; Wed, 17 Jul 2019 06:45:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqweDopWXBgVNIqUg4gmdFImuMZZIR8LESjUEnxms4aZv86ZZX8OHeICVhlZcrmkdnmuln2S X-Received: by 2002:a50:fb86:: with SMTP id e6mr35014902edq.203.1563371122273; Wed, 17 Jul 2019 06:45:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371122; cv=none; d=google.com; s=arc-20160816; b=w1ApEWQrex3ES9kLc8pAOZMruXztH/MMio59/N4Fe4/uIHgdLGbp1BqqWXjNFR/ZcJ xVM7Xpl59Tzh+pBC+QAIzbSRVI80kuaSsqN5hTzF5Y9EyBpq+m5xIdQuBBOrlUP/vlfa WimNu6H4CAVOlDqPC7izlv8aJ0+oAFJGZDkUA4b9nbZACG/kfW24Q7cFYzAOpKPmgd87 QaeBmmkNQf7v0CKYIXOF13jxi9A9IpMK/+P6bnXnS/gjmBJjTLmP7NoBdAKZqH5kxGJu 3Iom4CnGOojxLFizn4obVMDIORhHRpuUutPamOsqaX1EYRVjXqDltlaBh/tcKn+M5VLE RjOA== 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=Uwej0osFkVecc1FOdZr4jnm39hj3PGH7mOMeiSpdwWM=; b=AeuL9Tso8ilIpw9Db/EjqGhiWpBmMyitKSMEddUqzKVrYIZLX9F41hWif/+czPpjeZ EZadqkI6lhFnlHJ+3NkqSMBhR7DEkA4mtMkgJvoD7AMfILsDbMehXr1hTN1IQqzrrwes tnwuSU8yGfepB8qNZqUHW3TOG0zXHTxxFBqrN2Fp2QkM/IX2ocnv5UXjXdQaZaUWaRhB v7YQWIPPtF6GZPHxISTjhEI7qKijCV1GyduwyQfY4OyQ61cD6nWL1E16/CGG0+ZRwhFs LPBCpAOnzacSzaO9WYkQVewMWqVc8CUReLjdmxOCcaf7lFwXpndrSuHPTkzVM8DoWObB TzHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NkgeUcLd; 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 g53si14045357edc.53.2019.07.17.06.45.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:45:22 -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=NkgeUcLd; 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]:57308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkFE-0002vW-Qc for patch@linaro.org; Wed, 17 Jul 2019 09:45:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55414) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDj-0005M8-HO for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDi-0004ZG-3U for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:47 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:35100) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDh-0004Yr-TC for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:46 -0400 Received: by mail-wm1-x336.google.com with SMTP id l2so22244366wmg.0 for ; Wed, 17 Jul 2019 06:43:45 -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=Uwej0osFkVecc1FOdZr4jnm39hj3PGH7mOMeiSpdwWM=; b=NkgeUcLd9uUdCX/FyNkApLdMESHm9tNZOxvrWMTdgEISNWBBNkShUayPe5gIRcnGOK hfb61tzDVlPzmL1vZc7D4vi90fksC+1Pbl4vQTVaKdfL9IViE7uqitVj/vhut9vTn8SN PiRaCK3UBvooNDLdAWZzB+IjAa1L2YU8vXmLexKwrnj+7wH/lRpcmIzODgj98nY/GBDO +w5LCsaRMZVm6s7qnLXx2tXKN6KR+7K3GfSwKC4y6OvYk7vI52RWRVQ4oWUScevIaaY0 2cYMqTm5kexrdfMkPOeG79TZ61XgRXKPdSyqzR1Bc652++/PDkRT7rUwPdOehK4PqG9j 7qfw== 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=Uwej0osFkVecc1FOdZr4jnm39hj3PGH7mOMeiSpdwWM=; b=RCA+jm/sfQyRycj1+e1Brz5EihB5UqPLvDDu9CR43y1MGQ168nU21dJNIBMofXgWTS e+NBGQofWJGu0PrlmrPa3nZNIK6WfWZ10ONn4RtGG7AQRVhJW6/1ZZC0g8OghFlNMA+R Mp4lCOS7Kd0bgOiqzEBLX65uMaD+Lg7C2MyeYtyXG/5kgre/Q3Sm3F0f6nbkbkEZ1uBi lwgqKG6o77FjWxqrvMxOMsJwXhXhMtzz9GnuDcb04jiqs9xDZmJNfbfURnYoMo1zT9Zs +++r5/htrl0Lt+k+q4Lw9E/iCli34E7pgOUtHSPzTvGfDh9TZZZYjjUNIsAfgWrWHCij vX2g== X-Gm-Message-State: APjAAAW0pnA/Witr+so+ehRAEjVwcuZWav37eJeeo8zmcsxkzxioaaH6 wmYOnTYiOEdx2QQytueYq3U6Gg== X-Received: by 2002:a7b:c0c6:: with SMTP id s6mr39064273wmh.115.1563371024740; Wed, 17 Jul 2019 06:43:44 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e7sm23480488wmd.0.2019.07.17.06.43.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:40 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BF2B31FF9A; Wed, 17 Jul 2019 14:43:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:22 +0100 Message-Id: <20190717134335.15351-11-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 10/23] tests/docker: Install the NSIS tools in the MinGW capable images 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 , =?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é 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 /bin/sh: 1: makensis: not found Makefile:1077: recipe for target 'qemu-setup-4.0.90.exe' failed make: *** [qemu-setup-4.0.90.exe] Error 127 Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190715174817.18981-4-philmd@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++ tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++ tests/docker/dockerfiles/fedora.docker | 1 + 3 files changed, 7 insertions(+) -- 2.20.1 diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/docker/dockerfiles/debian-win32-cross.docker index c787e432454..77f5cc45e92 100644 --- a/tests/docker/dockerfiles/debian-win32-cross.docker +++ b/tests/docker/dockerfiles/debian-win32-cross.docker @@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé ENV TARGET i686 +ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin + RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \ @@ -19,6 +21,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ mxe-$TARGET-w64-mingw32.shared-lzo \ mxe-$TARGET-w64-mingw32.shared-nettle \ mxe-$TARGET-w64-mingw32.shared-ncurses \ + mxe-$TARGET-w64-mingw32.shared-nsis \ mxe-$TARGET-w64-mingw32.shared-pixman \ mxe-$TARGET-w64-mingw32.shared-pkgconf \ mxe-$TARGET-w64-mingw32.shared-pthreads \ diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/docker/dockerfiles/debian-win64-cross.docker index a7068ed6ac6..3908c5abc42 100644 --- a/tests/docker/dockerfiles/debian-win64-cross.docker +++ b/tests/docker/dockerfiles/debian-win64-cross.docker @@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé ENV TARGET x86-64 +ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin + RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \ @@ -19,6 +21,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ mxe-$TARGET-w64-mingw32.shared-lzo \ mxe-$TARGET-w64-mingw32.shared-nettle \ mxe-$TARGET-w64-mingw32.shared-ncurses \ + mxe-$TARGET-w64-mingw32.shared-nsis \ mxe-$TARGET-w64-mingw32.shared-pixman \ mxe-$TARGET-w64-mingw32.shared-pkgconf \ mxe-$TARGET-w64-mingw32.shared-pthreads \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 2350d494d9a..226ac1026fa 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -52,6 +52,7 @@ ENV PACKAGES \ mingw32-libpng \ mingw32-libtasn1 \ mingw32-nettle \ + mingw32-nsis \ mingw32-pixman \ mingw32-pkg-config \ mingw32-SDL2 \