From nobody Tue Feb 10 03:39:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563878308; cv=none; d=zoho.com; s=zohoarc; b=eEh+m/+iTCMhe3gWTJrb32garzwJIn41XYxQJycuCLa5zET7hqIY9zbnHzx4gG0vF/g3s8nl2GN1vPm78nKitaIJjrW+Ah5KOobYrN3OppVeIziQVeIJd8DzNOHGtAyjdx5sG1RUhCTlMKHiIupplgo2LdVKjbop8UDAZkpPJj4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563878308; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=JxhRJPthXwD0jkNCvy1f0oAonRtBCJFL3sFbTnWENEg=; b=QYANK3HUwd3GZNdwvZyzWCWMTSLDYZsYMO3DNDBc9qi0UxTQfjaSRHIEUpdsZRrXCmAn3vAwCzTqlhtnjEzaK5S2vCR3K4iiFVL01ez2Ic2CX70qL9/DTd0adLefHG+9lvpRm8AcuxaIKVCLoHLHbV2sWk/nQmVkGW2um6dNdbs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563878308474914.688105692651; Tue, 23 Jul 2019 03:38:28 -0700 (PDT) Received: from localhost ([::1]:41026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsBf-0005wU-4b for importer@patchew.org; Tue, 23 Jul 2019 06:38:27 -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) 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) 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-Google-Smtp-Source: APXvYqxG2zCzCVPQsNcxcPRcmgh1J1rYaB8ys7yyBVxLoapTcElt+BOaTxiAs9EG+7NJGFoGwBHj0Q== X-Received: by 2002:a1c:a7c6:: with SMTP id q189mr69553043wme.146.1563878182086; Tue, 23 Jul 2019 03:36:22 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This fixes: $ make installer (cd /tmp/qemu-nsis; \ for i in qemu-system-*.exe; do \ arch=3D${i%.exe}; \ arch=3D${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=3D"y" \ \ -DBINDIR=3D"/tmp/qemu-nsis" \ \ -DSRCDIR=3D"/home/phil/source/qemu" \ -DOUTFILE=3D"qemu-setup-4.0.90.exe" \ -DDISPLAYVERSION=3D"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=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190715174817.18981-4-philmd@redhat.com> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/doc= ker/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=C3=A9 =20 ENV TARGET i686 =20 +ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin + RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \ @@ -19,6 +21,7 @@ RUN DEBIAN_FRONTEND=3Dnoninteractive 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/doc= ker/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=C3=A9 =20 ENV TARGET x86-64 =20 +ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin + RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \ @@ -19,6 +21,7 @@ RUN DEBIAN_FRONTEND=3Dnoninteractive 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/dockerfi= les/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 \ --=20 2.20.1