From patchwork Wed Jul 17 13:43:25 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: 169143 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp998438ilk; Wed, 17 Jul 2019 06:52:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqyRXUzBaC5EaX+Q/CnbQ42/c/QPYOYy8VpYI17299AaoQ/+Fgz8GoV+nPkxzKKU92v/OXRS X-Received: by 2002:a17:906:9711:: with SMTP id k17mr31574595ejx.298.1563371524126; Wed, 17 Jul 2019 06:52:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371524; cv=none; d=google.com; s=arc-20160816; b=gO5DYCijXuSFZ8snEUY+ZRXhXETFu48vkdUlfA7MJRPzOSDuyCbU0QQX6xLw/NHrtG fpzysqL+85/mWoHTTjxmLFQ+Q6PsD8YxK3v+zIxXjenucKXwt8bWTTLvgZShsrVVRwl7 JMc+rL1qAZxtJaE/UGQGWAk9BFd1iu4+w3TdrtsGTWJTUcKaop63981qzpfYOE+7L7VT g46vY5sq6rXA7xkQ81V60vmpggbftOewRbMWHTkdHW8AJNY3Y/doSGsRIaEQ0+bLwq+m nMo2aPZp/nds7zLKClPfT/F8dn9S8wYX8C4MSELWS1DZQSHZy3MJ86nPucceswWWsbPK rcdw== 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=1rdrIH3bm5qkuZl4p0xTWAvlSwsZzcm3Oz5u60m4FZ8=; b=acEq2tSC0S0F1x89RyYesY/+2e+loUoO8ZMzHm49L+G3Ux2XX70hHGmnT0O8yeSzVW vbk7iAoDtyu4v9/83xULCQ+qB+/LerdXY8cvxsTnYT9jRkddSukWnGob9XTsGimejhzG jdFoWP59pu+G2h6E2woiP9eVhqhyNZZ8A0NFVXDnnpbHvmg7DNwTgnvsBubJ6CvBzndL 2doCoDN24ONsE+I5O+jlT0ksiQ0yWLXA1rhh5+TgIylKdq8h0IzKXl4wWdNC1s4AouFY JOYmJy0duDGJqyuo96Nlw7sfoxLpgQrSyvoaXARBcGZCdQy+g8rkTf085CwNtvtJ+YUF ss7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LloJJfsA; 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 h19si14928986ede.279.2019.07.17.06.52.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:52:04 -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=LloJJfsA; 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]:57420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkLi-0007v5-Lv for patch@linaro.org; Wed, 17 Jul 2019 09:52:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57854) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKh-0004dS-Lo for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:51:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKg-00014X-OP for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:59 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:51058) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKg-00013V-I6 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:58 -0400 Received: by mail-wm1-x32c.google.com with SMTP id v15so22272962wml.0 for ; Wed, 17 Jul 2019 06:50:58 -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=1rdrIH3bm5qkuZl4p0xTWAvlSwsZzcm3Oz5u60m4FZ8=; b=LloJJfsA9sHBBM7peW5bhux7Tst3iGkBDy1wseASmAmsjI8YrQlcbYR6V1GgA2wPZZ sDvqVIcpdf6KdnZxFESbGTcQe3H15CAZxEhy5trw5RvWYc1CP0Ks8k+Kk69RyHDtd4Xy /FE1GBJmyJP63yHL5ylzgJ+DeRZDUA2ZKwKR/S275pZJnGChziss+WqGCASSiZ1GjmbA ANaH1934Ya5+hmjZ28R5hRmyuVJfhYhFIiOtVnCPepDqkZEfX5wLfy6jB8RjL4T+DR3L VQfFFOXBqj7WHExo7hQwQ3Hx9FOZ2EbGVvp7z8i1035rMaYnTl9EB5IPQ85OpOhbT5K0 EkAA== 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=1rdrIH3bm5qkuZl4p0xTWAvlSwsZzcm3Oz5u60m4FZ8=; b=WVfJc33blBQInc+WIoBvnyD1spVNJGQgFuS8di7J6/ZPi0ffBVdHwh7ZJkr60els2c nhEMCiiBX1K8xZQh/mWaxwKcLzzcovJuqj0le2TaO80mzvsmCcwWm5XW2EHRcvh9bgbE m1DTaZWOgqNnzwTyIn13QHRgPxe+l02H9nZToq40Rg+0QSqxDG9FymxPgyxJEXRUoHvP 4rciDJEgfbC8lIuYooYEYpqMal/5Al1PDp6uJYaMOB4+iBw7gCxCvmNjqHZjBsK/SGyP O9XKc5Y1B7h+sUvYlfre3G3C28pPrGc71ydC3SmCbxE+gYHImN3P/D7WHPtnWsTGeVt5 SXEw== X-Gm-Message-State: APjAAAWfHnDBTAVqprB+Xmeayx2rXQqCNc1UtOJuRf6N7dLaQTNBBkxT EpPC/uFtoBcLxgrOr03A6XfnSA== X-Received: by 2002:a1c:e0c4:: with SMTP id x187mr35258811wmg.177.1563371457347; Wed, 17 Jul 2019 06:50:57 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s10sm18975823wrt.49.2019.07.17.06.50.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:55 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0AB451FF9C; Wed, 17 Jul 2019 14:43:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:25 +0100 Message-Id: <20190717134335.15351-14-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::32c Subject: [Qemu-devel] [PATCH v2 13/23] 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: =?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_GTK="y" \ -DBINDIR="/tmp/qemu-nsis" \ \ -DSRCDIR="/source/qemu" \ -DOUTFILE="qemu-setup-4.0.90.exe" \ -DDISPLAYVERSION="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=outfile 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é Message-Id: <20190715174817.18981-7-philmd@redhat.com> Signed-off-by: Alex Bennée --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/Makefile b/Makefile index f9791dcb827..5a462629370 100644 --- a/Makefile +++ b/Makefile @@ -1075,7 +1075,7 @@ installer: $(INSTALLER) INSTDIR=/tmp/qemu-nsis -$(INSTALLER): $(SRC_PATH)/qemu.nsi +$(INSTALLER): install-doc $(SRC_PATH)/qemu.nsi $(MAKE) install prefix=${INSTDIR} ifdef SIGNCODE (cd ${INSTDIR}; \