From nobody Wed May 8 18:32:44 2024 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563212943; cv=none; d=zoho.com; s=zohoarc; b=eG+BPN+xLbBkcMNFhp0sGLcF+EhyRx7cN2IXz4v6RTbqoPQ3Cud3n8yepXu8jvOn8/h17N0I04Gt2WNlsInAMKCSPop1ZZ2K4LN/ghEkNMmYCkKU18lC8OTKwIo1w6J2Qytz2ldR5cZkc19mJ+bJBNW9rKljNgdn7lwOOjA8/0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563212943; 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=/FZ/J5/w/uuAv0MSsVCz0Pkt8YsXkClX7CswUTPE/KM=; b=XMJeUt30bBjHu80LeTmeUzMEwUJ/U1udrAEIxK0LfOgPPW5jd+eUCjCK9sqrZmsipJoJf5VWzTnAnfubymMq2qIzyGB8E9Wj842oWWv8R2svZ032K8aHWl4Ybog+TKnH5j9PWGX5VkJhaj6FPHfSRy+AlkaBzu8AysK8A82M/54= ARC-Authentication-Results: i=1; mx.zoho.com; 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 1563212943341106.18093518622936; Mon, 15 Jul 2019 10:49:03 -0700 (PDT) Received: from localhost ([::1]:41478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn55y-0005Df-Cw for importer@patchew.org; Mon, 15 Jul 2019 13:49:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50503) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn55f-00047t-Q0 for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:48:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn55e-000745-Kt for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:48:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56664) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn55e-00071z-D8; Mon, 15 Jul 2019 13:48:42 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8F78436883; Mon, 15 Jul 2019 17:48:41 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D7CA55C260; Mon, 15 Jul 2019 17:48:34 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Stefan Weil Date: Mon, 15 Jul 2019 19:48:08 +0200 Message-Id: <20190715174817.18981-2-philmd@redhat.com> In-Reply-To: <20190715174817.18981-1-philmd@redhat.com> References: <20190715174817.18981-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 15 Jul 2019 17:48:41 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [NOTFORMERGE PATCH v2 1/9] tests/docker: Kludge to build the Fedora image 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 , Thomas Huth , Laszlo Ersek , Helge Deller , Cornelia Huck , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Rebuilding the Fedora image is failing: $ make docker-image-fedora V=3D1 [...] Step 4/8 : RUN dnf install -y $PACKAGES ---> Running in cef9615efafb Fedora Modular 30 - x86_64 2.0 MB/s | 2.7 MB 00:= 01 Fedora Modular 30 - x86_64 - Updates 1.6 MB/s | 2.3 MB 00:= 01 Fedora 30 - x86_64 - Updates 6.1 MB/s | 17 MB 00:= 02 Failed to synchronize cache for repo 'updates' Error: Failed to synchronize cache for repo 'updates' The command '/bin/sh -c dnf install -y $PACKAGES' returned a non-zero cod= e: 1 Traceback (most recent call last): File "./tests/docker/docker.py", line 615, in sys.exit(main()) File "./tests/docker/docker.py", line 611, in main return args.cmdobj.run(args, argv) File "./tests/docker/docker.py", line 413, in run extra_files_cksum=3Dcksum) File "./tests/docker/docker.py", line 280, in build_image quiet=3Dquiet) File "./tests/docker/docker.py", line 207, in _do_check return subprocess.check_call(self._command + cmd, **kwargs) File "/usr/lib64/python2.7/subprocess.py", line 190, in check_call raise CalledProcessError(retcode, cmd) subprocess.CalledProcessError: Command '['docker', 'build', '-t', 'qemu:f= edora', '-f', '/tmp/docker_buildbKtWAa/tmpIctHw2.docker', '/tmp/docker_buil= dbKtWAa']' returned non-zero exit status 1 make: *** [tests/docker/Makefile.include:53: docker-image-fedora] Error 1 The fix found in one of the comment from this thread helped to have it working again: https://bugzilla.redhat.com/show_bug.cgi?id=3D1706627 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- I have no idea what it does, it just works (TM). --- tests/docker/dockerfiles/fedora.docker | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index e6d39e14cb..f6be5e2dd7 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -94,6 +94,7 @@ ENV PACKAGES \ zlib-devel ENV QEMU_CONFIGURE_OPTS --python=3D/usr/bin/python3 =20 -RUN dnf install -y $PACKAGES +RUN echo zchunk=3DFalse >> /etc/dnf/dnf.conf +RUN dnf clean metadata && dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt ENV FEATURES mingw clang pyyaml asan --=20 2.20.1 From nobody Wed May 8 18:32:44 2024 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563212962; cv=none; d=zoho.com; s=zohoarc; b=XEIoegywL5ylIwU2ekDRTYl/bvenP5+KJM5QxBHAVodgeQrX773j2bX3GSsKS5D1IEIEjaWEQ2xt//GbfhL5cODeLeUmuNGfapnTzx57lqpwCq4NDLCFgoR3R0qAIpuFryujFNrD/mLB38jOvrY8XAm0uRnFOGP05PqNkY6rqTc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563212962; 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=gHRpaIN9dzQwz+cnZHF4kDcdHb9WqGnZzHcRU+J9cXA=; b=CJub2bP0zkQ2WQr4adQ4VeN6BlVJRZpLdZd1Kk88gDz7+LAxKlwEuP/koJhBNDuHpTJtMjpVHf8OnkYJky0ZnaX2vdf7+qOUP1cAUnqk6kiB8KbAjsvKy44FPdtQU75K0Y+8sp7vzMVIku5pI6lTOBzKq8CxSHR0PuNUQ3Ak7B0= ARC-Authentication-Results: i=1; mx.zoho.com; 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 1563212962162176.9606159365054; Mon, 15 Jul 2019 10:49:22 -0700 (PDT) Received: from localhost ([::1]:41490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn56G-0006I8-T8 for importer@patchew.org; Mon, 15 Jul 2019 13:49:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50573) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn55y-0005Qk-8E for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn55w-0007k5-4X for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36698) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn55q-0007QX-Fq; Mon, 15 Jul 2019 13:48:56 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6843C3082A98; Mon, 15 Jul 2019 17:48:52 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0FE9C5C224; Mon, 15 Jul 2019 17:48:41 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Stefan Weil Date: Mon, 15 Jul 2019 19:48:09 +0200 Message-Id: <20190715174817.18981-3-philmd@redhat.com> In-Reply-To: <20190715174817.18981-1-philmd@redhat.com> References: <20190715174817.18981-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 15 Jul 2019 17:48:52 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH-for-4.1 v2 2/9] tests/docker: Install Sphinx in the Debian 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 , Thomas Huth , Laszlo Ersek , Helge Deller , Cornelia Huck , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Since commit 5f71eac06e the Sphinx tool is required to build the rST documentation. This fixes: $ ./configure --enable-docs ERROR: User requested feature docs configure was not able to find it. Install texinfo, Perl/perl-podlators and python-sphinx Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: Only include base image (the ones to cross-build qemu, not the ones to cross-build user-space tests) (Alex) --- tests/docker/dockerfiles/debian10.docker | 1 + tests/docker/dockerfiles/debian9.docker | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/docker= files/debian10.docker index aeeb151b52..cf57d8218f 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -27,5 +27,6 @@ RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ pkg-config \ psmisc \ python \ + python3-sphinx \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d= \ -f2) diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerf= iles/debian9.docker index 5f23a35404..52c589a7d6 100644 --- a/tests/docker/dockerfiles/debian9.docker +++ b/tests/docker/dockerfiles/debian9.docker @@ -27,5 +27,6 @@ RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ pkg-config \ psmisc \ python \ + python3-sphinx \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d= \ -f2) --=20 2.20.1 From nobody Wed May 8 18:32:44 2024 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563212995; cv=none; d=zoho.com; s=zohoarc; b=TtWsstQnLYxkw6cBa2lw5+dm95YqHlpaBR/opddvhN1e+dhjBMe3AhyAv8rlRFtjC5o4DsiaFrwbut01OJRq16SXxtTW14tOLu5Td6ZXVF8fdvrrO+pxNujUDcnuZKHjPxeGO2SgbwulsB2mgW682GK9DWRrf1XGTMnObqwGMCI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563212995; 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=yLZEvB7PqgFS/aL+mBRjfLsVqpJ/XEv+ihuQRV424Ic=; b=nphJ48rh7a8N6+E6lWRcmIYd7jBLo8MZm9OVPtLN7BQBVPIHwOgLCl84whPy0Q8PYDhuTPZVgS91LI5moGabSyxQL2Gsv86zwJv1ulKeVLQ1wWWiJN0q1QjWX9hFgRVZ9YIWG08d/OZ+JwFVyp7ThSqbdPCra+xHHzSvVeyr7io= ARC-Authentication-Results: i=1; mx.zoho.com; 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 156321299592575.35378976728316; Mon, 15 Jul 2019 10:49:55 -0700 (PDT) Received: from localhost ([::1]:41516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn56o-0000E7-I5 for importer@patchew.org; Mon, 15 Jul 2019 13:49:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50591) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn561-0005Zk-BA for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn55y-0007qG-8F for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43156) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn55w-0007fs-4H; Mon, 15 Jul 2019 13:49:02 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5A09385542; Mon, 15 Jul 2019 17:48:58 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 347075C225; Mon, 15 Jul 2019 17:48:52 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Stefan Weil Date: Mon, 15 Jul 2019 19:48:10 +0200 Message-Id: <20190715174817.18981-4-philmd@redhat.com> In-Reply-To: <20190715174817.18981-1-philmd@redhat.com> References: <20190715174817.18981-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 15 Jul 2019 17:48:58 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH-for-4.1 v2 3/9] 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 , Thomas Huth , Laszlo Ersek , Helge Deller , Cornelia Huck , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 --- 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(+) diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/doc= ker/dockerfiles/debian-win32-cross.docker index c787e43245..77f5cc45e9 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 a7068ed6ac..3908c5abc4 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 f6be5e2dd7..cc9bef189a 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 From nobody Wed May 8 18:32:44 2024 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563212977; cv=none; d=zoho.com; s=zohoarc; b=fst1//RPqOHqRKdrmURWhKlqybB2ioDGMz05KAFinWSXnqLqp+EhUHxy0OzIefqIuXV5DkpRCwAvQqfYdAtnF72+e2EWP+c0HNThHnrAHPeZjYWUBdrl3uINX3cSSmT0+o+iNLexQttZ+2ViSsB9aomKXWQjn/EcxjbTpndOYcQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563212977; 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=DnLCzWYN7NQ25fE4cQFAFOXKniYz6qER5S/AF+vA3og=; b=LPQIpVM9Qqnd/ZlKWlWvoJ3OQuLqKXGeST7r+mUmiOoVldIs0getLVNQAns5aBsHmAcKw9rzfqVQcRaQMguCJW7CXktkACnk1uXaM93D5H4ifbdXBqGwEwln33IdZuKMiBarTUnTJkufLEzWE3TtRzpRX+iVmDTCooRKxc0kwFE= ARC-Authentication-Results: i=1; mx.zoho.com; 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 15632129774621008.4003118678287; Mon, 15 Jul 2019 10:49:37 -0700 (PDT) Received: from localhost ([::1]:41508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn56V-0007OT-Un for importer@patchew.org; Mon, 15 Jul 2019 13:49:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50641) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn565-0005ye-FP for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn564-000854-Ar for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35478) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn564-00083m-4q; Mon, 15 Jul 2019 13:49:08 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5B9BD30842D1; Mon, 15 Jul 2019 17:49:07 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2602A5C224; Mon, 15 Jul 2019 17:48:58 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Stefan Weil Date: Mon, 15 Jul 2019 19:48:11 +0200 Message-Id: <20190715174817.18981-5-philmd@redhat.com> In-Reply-To: <20190715174817.18981-1-philmd@redhat.com> References: <20190715174817.18981-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 15 Jul 2019 17:49:07 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH-for-4.1 v2 4/9] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE 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 , Thomas Huth , Laszlo Ersek , Helge Deller , Cornelia Huck , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This silents a bunch of warnings while compiling the Slirp objects: $ make [...] CC slirp/src/tftp.o Package glib-2.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `glib-2.0.pc' to the PKG_CONFIG_PATH environment variable No package 'glib-2.0' found CC slirp/src/udp6.o Package glib-2.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `glib-2.0.pc' to the PKG_CONFIG_PATH environment variable No package 'glib-2.0' found [...] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++ tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++ 2 files changed, 6 insertions(+) diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/doc= ker/dockerfiles/debian-win32-cross.docker index 77f5cc45e9..dc74ce7e0e 100644 --- a/tests/docker/dockerfiles/debian-win32-cross.docker +++ b/tests/docker/dockerfiles/debian-win32-cross.docker @@ -11,6 +11,9 @@ ENV TARGET i686 =20 ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin =20 +ENV PKG_CONFIG_PATH \ + $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgco= nfig + RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \ diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/doc= ker/dockerfiles/debian-win64-cross.docker index 3908c5abc4..df7bfce7ea 100644 --- a/tests/docker/dockerfiles/debian-win64-cross.docker +++ b/tests/docker/dockerfiles/debian-win64-cross.docker @@ -11,6 +11,9 @@ ENV TARGET x86-64 =20 ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin =20 +ENV PKG_CONFIG_PATH \ + $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgco= nfig + RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \ --=20 2.20.1 From nobody Wed May 8 18:32:44 2024 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563212991; cv=none; d=zoho.com; s=zohoarc; b=gVWdbnm1EHtAqH5oqQxlP0oZm+gYFwZ+6aPhXSowYZ/YGwZTUKPw/xiYYC0gnHnDm2Ta3ZO4sur02ORvtpwca69JhTmWUaAEs7FUVCnoI5ONzK3NAZl4+HFF+3lIeBe7jjBNT3FBUkY367sGkuYulcyycZm9wfXJt42BizhKPKg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563212991; 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=4UGoVeqZU1gdM8ONsmMoTwJUpdvAR8n4SrFgF1/k7cg=; b=XSWD+5kDhVa5HxWkYQu/1TQqpjzVJyA6+ml5iHLAikrYLigzHWKe+qZ23eHePt5njkf7doKTEY32616pRGjA0787sfGcI9wQuGEe2IqPjn/1xbTrymmwJScnne3JTVqSamqKWODZQ9590rbBMu3ZDLlY+6+Rw8s1YMBd8XQlaFQ= ARC-Authentication-Results: i=1; mx.zoho.com; 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 1563212991748302.930439719098; Mon, 15 Jul 2019 10:49:51 -0700 (PDT) Received: from localhost ([::1]:41512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn56k-0008N1-Bx for importer@patchew.org; Mon, 15 Jul 2019 13:49:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50755) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn56G-0006jK-8I for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn56F-0008Ta-4s for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59176) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn56E-0008RZ-Vn; Mon, 15 Jul 2019 13:49:19 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3852C30832C2; Mon, 15 Jul 2019 17:49:18 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EA9985C224; Mon, 15 Jul 2019 17:49:07 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Stefan Weil Date: Mon, 15 Jul 2019 19:48:12 +0200 Message-Id: <20190715174817.18981-6-philmd@redhat.com> In-Reply-To: <20190715174817.18981-1-philmd@redhat.com> References: <20190715174817.18981-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 15 Jul 2019 17:49:18 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH-for-4.1 v2 5/9] tests/docker: Install texinfo in the Fedora image 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 , Thomas Huth , Laszlo Ersek , Helge Deller , Cornelia Huck , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The 'makeinfo' is required to generate the documentation from the 'html' Makefile rule (called by 'install-doc'). The NSIS installer uses these files. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/dockerfiles/fedora.docker | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index cc9bef189a..bb4e6f1c12 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -87,6 +87,7 @@ ENV PACKAGES \ systemd-devel \ systemtap-sdt-devel \ tar \ + texinfo \ usbredir-devel \ virglrenderer-devel \ vte291-devel \ --=20 2.20.1 From nobody Wed May 8 18:32:44 2024 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563213043; cv=none; d=zoho.com; s=zohoarc; b=jgZ2N2plbrlqVTj/aR/YPFzbJ6WOfwhVKQdoSHCAtEXIzvRbsVaPW3p2Lna9+lOzMM9BvWFZu+rkB/wJhOsPCap61DO62EsZcPoiFCvd4oWrKoMJU186+EfLmldhCtCuNs3sUI5yFBkqbxmeFnKRQb+FedzLypiL8ibdwrYoFCU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563213043; 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=MIsKbktrRS88bhjxm//E4YQaQJJTGJyzmnS9X5mRCJ0=; b=bX5fPeoLD5AnywgAGtDS6z87hHB61cb60ANcahiSi8KJD9wUQC1NjOovun0j3MNJ7rfpTfU+Y9GhvdW2b+X62EmCj7B708yqRAbFyxc4aH+uThIh+CW9CRmkpCStzqVU2/wsYX9YWpSNmZROg1xzqA5uAD2yMzFs/fnDv0CWFGE= ARC-Authentication-Results: i=1; mx.zoho.com; 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 1563213043047240.31584061146827; Mon, 15 Jul 2019 10:50:43 -0700 (PDT) Received: from localhost ([::1]:41550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn57X-0003eY-OH for importer@patchew.org; Mon, 15 Jul 2019 13:50:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50820) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn56S-0007d1-HC for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn56R-0000X6-Gb for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35612) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn56P-0000KC-9d; Mon, 15 Jul 2019 13:49:31 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 01E2130BDE49; Mon, 15 Jul 2019 17:49:26 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 052D55C28D; Mon, 15 Jul 2019 17:49:18 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Stefan Weil Date: Mon, 15 Jul 2019 19:48:13 +0200 Message-Id: <20190715174817.18981-7-philmd@redhat.com> In-Reply-To: <20190715174817.18981-1-philmd@redhat.com> References: <20190715174817.18981-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 15 Jul 2019 17:49:26 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH-for-4.1 v2 6/9] buildsys: The NSIS Windows build requires the documentation 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: Fam Zheng , Thomas Huth , Laszlo Ersek , Helge Deller , Cornelia Huck , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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_GTK=3D"y" \ -DBINDIR=3D"/tmp/qemu-nsis" \ \ -DSRCDIR=3D"/source/qemu" \ -DOUTFILE=3D"qemu-setup-4.0.90.exe" \ -DDISPLAYVERSION=3D"4.0.90" \ /source/qemu/qemu.nsi File: "/tmp/qemu-nsis\qemu-doc.html" -> no files found. Usage: File [/nonfatal] [/a] ([/r] [/x filespec [...]] filespec [...] | /oname=3Doutfile one_file_only) Error in script "/source/qemu/qemu.nsi" on line 173 -- aborting creation = process make: *** [Makefile:1080: qemu-setup-4.0.90.exe] Error 1 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Not sure is this the only dependency missing, or this is the correct fix... Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1fcbaed62c..f8dac48981 100644 --- a/Makefile +++ b/Makefile @@ -1073,7 +1073,7 @@ installer: $(INSTALLER) =20 INSTDIR=3D/tmp/qemu-nsis =20 -$(INSTALLER): $(SRC_PATH)/qemu.nsi +$(INSTALLER): install-doc $(SRC_PATH)/qemu.nsi $(MAKE) install prefix=3D${INSTDIR} ifdef SIGNCODE (cd ${INSTDIR}; \ --=20 2.20.1 From nobody Wed May 8 18:32:44 2024 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563213046; cv=none; d=zoho.com; s=zohoarc; b=RPXDXXF2d2NBKteJrKFHFFsvcXV4PmC6MUm7BkRaeiZaI4uSoyGnKGHlvBNBgnsE/FA6Tec2eijX/N3dSWNqMJZ072DTrmnAYKuhM2dpWZvue6kpRRid0zOeec8cqMx9TxOxuhVHdfD3iVz5pW/xCYM5Df+/vcKVeumEB6WJV8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563213046; 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=reZe1SziyAkKxSFhrsNAtHWPcHLBweKgz98RW+pdC5c=; b=ZgMJsKhqk9rDHneJA4SKeXOtC0jcmgX46bMP8owfiqF5HpBQrSqzLHLDF0ncrdYGJj2W8DtYnDWe0cwk1/SFBxOZqiyJO2Zkij64HCmCuBZT+9mATRAdW5C3g+VEv/d+vxQe8qRUwAzGmi9vN8yafarUrqJXzQkk27VH17PaWVI= ARC-Authentication-Results: i=1; mx.zoho.com; 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563213046087442.4241558615563; Mon, 15 Jul 2019 10:50:46 -0700 (PDT) Received: from localhost ([::1]:41552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn57X-0003fq-RQ for importer@patchew.org; Mon, 15 Jul 2019 13:50:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50865) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn56X-00080T-PJ for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn56W-0000iB-Jj for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34958) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn56W-0000fy-EG; Mon, 15 Jul 2019 13:49:36 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9C2B037EE0; Mon, 15 Jul 2019 17:49:35 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 78F6A5C224; Mon, 15 Jul 2019 17:49:26 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Stefan Weil Date: Mon, 15 Jul 2019 19:48:14 +0200 Message-Id: <20190715174817.18981-8-philmd@redhat.com> In-Reply-To: <20190715174817.18981-1-philmd@redhat.com> References: <20190715174817.18981-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 15 Jul 2019 17:49:35 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH-for-4.1 v2 7/9] 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: Fam Zheng , Thomas Huth , Laszlo Ersek , Helge Deller , Cornelia Huck , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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=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 File: "/tmp/qemu-nsis\*.bmp" -> no files found. Usage: File [/nonfatal] [/a] ([/r] [/x filespec [...]] filespec [...] | /oname=3Doutfile 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=C3=A9 --- $ file qemu-setup-4.0.90.exe qemu-setup-4.0.90.exe: PE32 executable (GUI) Intel 80386 (stripped to exter= nal PDB), for MS Windows, Nullsoft Installer self-extracting archive --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index f8dac48981..f2e5fd3316 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 \ --=20 2.20.1 From nobody Wed May 8 18:32:44 2024 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563213017; cv=none; d=zoho.com; s=zohoarc; b=LNs0gz9A42shx7Gd5JFiOH9AYhvT22ZiCyR6iKNpnmeYCV5RZjhJgwN7m/oZ4mRUA8yMQDl5sHEMg1Q6nrFkHyKcLcsYsatdygRZt3eEIQ93iE20Cm/otHtqiMTOTiYuQIMNsIFb1u0MeqM1H+xFMsXhU+vnXBJ8sSYwQh+LtVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563213017; 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=ukCiO1/ZDJLz5iNPDPj573m9mhgXR5gs56A2jVO8fdA=; b=IJw9IuUqecv8Kuw7CXjWNrZX5GfJTditM06GM0Xvb3XzzfiTB0Q5rp1UuGUAJ8vSYDYlODs24yaeb/kTAtwaSta7BhQSawLc06YrJDi6qxdglGubVs1eYX+mhFCxT/rH2+TYLkJXhyOIYqJmMBEhotkpIPPqHwdlJV49GQeseYs= ARC-Authentication-Results: i=1; mx.zoho.com; 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 1563213017438971.2252577344824; Mon, 15 Jul 2019 10:50:17 -0700 (PDT) Received: from localhost ([::1]:41532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn579-0001pc-SZ for importer@patchew.org; Mon, 15 Jul 2019 13:50:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50905) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn56d-0008SQ-QV for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn56c-0000ta-UM for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59272) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn56c-0000t9-P1; Mon, 15 Jul 2019 13:49:42 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F180B308A958; Mon, 15 Jul 2019 17:49:41 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 68B785C225; Mon, 15 Jul 2019 17:49:36 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Stefan Weil Date: Mon, 15 Jul 2019 19:48:15 +0200 Message-Id: <20190715174817.18981-9-philmd@redhat.com> In-Reply-To: <20190715174817.18981-1-philmd@redhat.com> References: <20190715174817.18981-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Mon, 15 Jul 2019 17:49:42 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH-for-4.1 v2 8/9] tests/docker: Let the test-mingw test generate a NSIS installer 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 , Thomas Huth , Laszlo Ersek , Helge Deller , Cornelia Huck , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The NSIS installer generates an executable suitable to install QEMU on Windows. Suggested-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/test-mingw | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw index 4b84cfe120..72660bb14d 100755 --- a/tests/docker/test-mingw +++ b/tests/docker/test-mingw @@ -29,6 +29,7 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do --enable-bzip2 \ --enable-guest-agent install_qemu + make installer make clean =20 done --=20 2.20.1 From nobody Wed May 8 18:32:44 2024 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563213028; cv=none; d=zoho.com; s=zohoarc; b=LMSRXHJf5M3TToKHWZDDLWhZZNcsfuKEtLQxs0D/Kjo70BCSv3YvQF1ddZarFkDEL+cY4QciWZLPtCt4shFRXQ81EQlXr8n//GbMx1k05/RpK03pdJO1LYAchJ3HQYTXQ7bbFkF4exyP41izak9F3mfYHa6SnamNN3DgmZQuxJE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563213028; 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=PN4EatLC/GtAyhTDw75Tt+NRdQnKflW4f47T4EjS1zI=; b=hCjy8ORwew251CCGIK85UgUrTaEHaQLJZXS3fHFMEV26+5SRazg1HVoCS+BT1WKZVY8Kru+bZmT2KEtPq27ryPzWcvUzYN+ANk31MuDmiaHtT0aZxTcA83P+qzydhNq12M3YD43n+xRxbiUJW9lqUk+r783EhbghHbsMVzOzj/w= ARC-Authentication-Results: i=1; mx.zoho.com; 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 1563213028111469.925478116734; Mon, 15 Jul 2019 10:50:28 -0700 (PDT) Received: from localhost ([::1]:41542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn57K-0002cM-Uh for importer@patchew.org; Mon, 15 Jul 2019 13:50:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50959) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn56n-0000lW-Cf for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn56m-0001HJ-9Q for qemu-devel@nongnu.org; Mon, 15 Jul 2019 13:49:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48746) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn56m-0001Co-3l; Mon, 15 Jul 2019 13:49:52 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5D3903082129; Mon, 15 Jul 2019 17:49:50 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8B99B5C224; Mon, 15 Jul 2019 17:49:42 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Stefan Weil Date: Mon, 15 Jul 2019 19:48:16 +0200 Message-Id: <20190715174817.18981-10-philmd@redhat.com> In-Reply-To: <20190715174817.18981-1-philmd@redhat.com> References: <20190715174817.18981-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 15 Jul 2019 17:49:50 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH-for-4.1 v2 9/9] 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: Fam Zheng , Thomas Huth , Laszlo Ersek , Helge Deller , Cornelia Huck , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Laszlo Ersek --- qemu.nsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qemu.nsi b/qemu.nsi index 75f1608b9e..89c7c04f95 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -122,6 +122,9 @@ Section "${PRODUCT} (required)" File "${BINDIR}\*.bmp" File "${BINDIR}\*.bin" File "${BINDIR}\*.dtb" + File "${BINDIR}\*.fd" + File "${BINDIR}\*.img" + File "${BINDIR}\*.lid" File "${BINDIR}\*.rom" File "${BINDIR}\openbios-*" =20 --=20 2.20.1