From patchwork Tue Jul 23 10:35:59 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: 169501 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8704432ilk; Tue, 23 Jul 2019 03:38:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqyuzfY/yb9ohu/8DogHAX4ZfzICYkv1+b1WGLXD5VaMPUcfwhPMAkQF2WtX/PX+3o2wZskw X-Received: by 2002:a05:6214:10ea:: with SMTP id q10mr30576951qvt.4.1563878298596; Tue, 23 Jul 2019 03:38:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878298; cv=none; d=google.com; s=arc-20160816; b=t5jHDPEeS6tEhKfc7YHSJKfR5+FIvciRDRChrwjgJ0N4pEiBO0oHXK3CkxDv+YGC1h yOw5rWwQJsaKfqY3C1D4ThbpBKo13XxE/bWTQ9WOwQt5zcppJV8vxypXFKz/BER1xqfg dKdmbZ6zWtq5rAyAOvGmeAZ4jQ8J3vTCrR92yPxw4iL8SKcl5+PJrAqFfalvCuvtP7C5 5GIyeYcyiytMa3AnJNVT7jpj3MIirgtk22paDN3NkP0H0LyUcNMYydFpMndVgkjGFNs8 EgwT1kTqKUtF6M7ktdhbgk14omaL3JrMkqQftSA3KEGN2D8LL+r7j9qvK22fLnXHoHYr hU6A== 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=JxhRJPthXwD0jkNCvy1f0oAonRtBCJFL3sFbTnWENEg=; b=dGYMOjcqBpQpwdsbtbqxH9vkw4YrysI9V6sA7Yj67Y9qNkFmvBP3bFQiSqDLw+3kbC YRqyta9ybp9zng+kFjwyosGFQGgqvVosEs4jRqJmt+g0GVuQu3yZZbDK2FEHv/bPXfUn k7zMkTIofkcvTDpxoLVp7uqbWNe/Txs8Il02uG0IM9J5dhyoeAMrpGJLU7qOEoep+ySq RALbxUuTYMJ/FYV0ncLKwOlGQ0aOw4Ykcuu4KWTJJMFQwIOoCDU5SLCHMOF49wDmDwSy ysyksfid2qb3xyBO6YtaIfkiM4uJN/UUus6bLV3TbFXiggmbyUL7aHd2NWmqqY++Kp+K +xIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qwZQC+jD; 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 25si493412qvo.149.2019.07.23.03.38.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:38:18 -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=qwZQC+jD; 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]:41018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsBV-0004iU-Mj for patch@linaro.org; Tue, 23 Jul 2019 06:38:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37891) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9g-00067V-LN for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9f-0007SD-Dq for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:24 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:35929) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9f-0007Qw-6C for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:23 -0400 Received: by mail-wm1-x32f.google.com with SMTP id g67so33921748wme.1 for ; Tue, 23 Jul 2019 03:36:23 -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=JxhRJPthXwD0jkNCvy1f0oAonRtBCJFL3sFbTnWENEg=; b=qwZQC+jD3WCCDZp/CtYaOfnQcywI7fF7tjPXRv03YTpOsiEU61iRDuiXJP41oC9P2E en1ubnSWOGvK0rhuzydoECUPrwtMGcYDk9NIr5TS9ozbfG59cfL4mam01XE7F0nfaL9+ oTGHa9OBIomRR39h+HSGpJ6vvnn4bVqQ4ZRvmQoJzdfvchijSryk0jHULWdbczXRfkhI AXp2U5M0pmDd+/nUiLJJIxCUpJDj81xZi/X56T3lz4YBKtw9EWb5Fsck+E6su+h5mOWR /iOEMyqLom7m860Fj5ROmp04+gFX2GLxEGyUWEQPdwdu7S7qNy+N/g0MHwnB6BvQXpli VTVA== 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=JxhRJPthXwD0jkNCvy1f0oAonRtBCJFL3sFbTnWENEg=; b=W4p/jwOahZSfLT3n8tTMbmwxmYqTm/Gsvbing+GLZTLl6vAqTji3Lp+xaqFrK0y1I/ naKOEnj2+7p/rS0Z0SBBxsgtIHBiJO56LMAXECBDcj8q0OOroxncTmowYFID2z05caeE 9MNqnQgsVnowYtp5ILW/OQzkeKo4fmj2+JOt8334i1xlDylYUJKdkig/GJr9swgdG+Qh BkK+TIyWMp/0rw1urJZAisBOXJ5wtyAsYAHbzqo0uHcB+JQHBKeuZRyYrN76Lp+XmVtH YjZmAAAXjH4F9o8e/PI2ZcAzWT9jEo/oMR6XbLrbQhf4JumT4kdddiLOlamddPaueLaU yAHw== X-Gm-Message-State: APjAAAXTDyJC5OUzswkEYSaqqTfgfIIZ71nM5wkeZpp5w20IB8QS9nUv xeu7GIr1ewL0QAiSZgk4aBVZKg== X-Received: by 2002:a1c:a7c6:: with SMTP id q189mr69553043wme.146.1563878182086; Tue, 23 Jul 2019 03:36:22 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k9sm30856009wmi.33.2019.07.23.03.36.15 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:19 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 468861FF9A; 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:35:59 +0100 Message-Id: <20190723103612.5600-11-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::32f Subject: [Qemu-devel] [PULL 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?= , qemu-devel@nongnu.org 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 -- 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 \