From patchwork Thu May 30 19:28:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 10969207 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5381876 for ; Thu, 30 May 2019 19:30:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4378628BF0 for ; Thu, 30 May 2019 19:30:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37A7128BFE; Thu, 30 May 2019 19:30:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E6C0328BFB for ; Thu, 30 May 2019 19:29:59 +0000 (UTC) Received: from localhost ([127.0.0.1]:58229 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWQkR-0007gb-2A for patchwork-qemu-devel@patchwork.kernel.org; Thu, 30 May 2019 15:29:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWQjp-0007Pg-Dz for qemu-devel@nongnu.org; Thu, 30 May 2019 15:29:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWQjo-0002FE-HG for qemu-devel@nongnu.org; Thu, 30 May 2019 15:29:21 -0400 Received: from mo6-p00-ob.smtp.rzone.de ([2a01:238:20a:202:5300::12]:36743) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hWQjn-0002Bc-Sa for qemu-devel@nongnu.org; Thu, 30 May 2019 15:29:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1559244554; s=strato-dkim-0002; d=aepfle.de; h=Message-Id:Date:Subject:Cc:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=iM3LMV33wWK5A6S5NQiiphOyt314pgydAcJzpdNmfHE=; b=oENx/EdmZLh+AH2BeKxfq5x84ZUp3zj515DrUQOT7pTFjptYOJi0SwSQtqv5EH0o5k ko+O6Eg9xIPAfSwHj//A2H5L3w6iZLiOsbTtjmOEIdtvrbeUqKTu11tWn4EPUtG/6sk6 /YlqtgyzdSE6xiK5gDuDge4ZRKWcGidWCyimJ8LOeUiFy1Ao17nGdlw3h973nU6AhO1q PYZnN69LZ9hyI6ocg7z3MZTTLvMl8SLAAbUopzPw/KCfGrQo6ZgVWpoToR/xrRgkZZ1d 13dxpenPG3EvkSCkY+TCsNpDe8dAvP0cPqHxUEMydEt//+6MUDvGO5SsuBbzqtVoclXX nBPQ== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS325Njw==" X-RZG-CLASS-ID: mo00 Received: from sender by smtp.strato.de (RZmta 44.21 SBL|AUTH) with ESMTPSA id N09966v4UJSahZu (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Thu, 30 May 2019 21:28:36 +0200 (CEST) From: Olaf Hering To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 21:28:11 +0200 Message-Id: <20190530192812.17637-1-olaf@aepfle.de> X-Mailer: git-send-email 2.16.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 2a01:238:20a:202:5300::12 Subject: [Qemu-devel] [PATCH v1] Makefile: remove DESTDIR from firmware file content X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Olaf Hering , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The resulting firmware files should only contain the runtime path. Fixes commit 26ce90fde5c ("Makefile: install the edk2 firmware images and their descriptors") Signed-off-by: Olaf Hering Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Laszlo Ersek --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f0be624f47..61267bf1a4 100644 --- a/Makefile +++ b/Makefile @@ -844,7 +844,7 @@ ifneq ($(DESCS),) $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/firmware" set -e; tmpf=$$(mktemp); trap 'rm -f -- "$$tmpf"' EXIT; \ for x in $(DESCS); do \ - sed -e 's,@DATADIR@,$(DESTDIR)$(qemu_datadir),' \ + sed -e 's,@DATADIR@,$(qemu_datadir),' \ "$(SRC_PATH)/pc-bios/descriptors/$$x" > "$$tmpf"; \ $(INSTALL_DATA) "$$tmpf" \ "$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \