From nobody Wed May 8 01:51:47 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=1564820777; cv=none; d=zoho.com; s=zohoarc; b=IBPkMB30AMCKdIwYLD8qFjpcn7IeIrP5Ge+ThwO7phX5l1QsKvH/mTyHw2c1nTWd6f0ZAwZJgXE2fJQ5URvsNStUAyJ8RrV+8tDwB640cbqJnfC9iDQSmQLxO20kdOeCKybLQQd/C0CsUEnO+8AqjxRTsHyaCZHPuHQhoPq/gXI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564820777; 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=eLFstjVIKFb8XpQguzlph2KLwFeBAVlUB29yQyqCIs0=; b=eJTHRAFMjl2AjQpKnfC/HNvS1mJJowSuiDTcY56pJvrjwB3x17ONpZTDKedmAt5mHxr20lq4DHinbeUBmzxIK5eWoClGX7i9n8n8zIFFwsOrF0sSLbTWVfQ30Tv592c+5sZlUXKDZ6oJvKi5q5SPF60uiCYUmWsYT/ERUjIhHXc= 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 1564820776958121.1748140800861; Sat, 3 Aug 2019 01:26:16 -0700 (PDT) Received: from localhost ([::1]:38920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1htpMk-0000Ak-C2 for importer@patchew.org; Sat, 03 Aug 2019 04:26:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41087) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1htpM0-0007pG-0s for qemu-devel@nongnu.org; Sat, 03 Aug 2019 04:25:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1htpLy-0006rI-Pr for qemu-devel@nongnu.org; Sat, 03 Aug 2019 04:25:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49752) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1htpLy-0006qZ-5d for qemu-devel@nongnu.org; Sat, 03 Aug 2019 04:25:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7DA583DE22; Sat, 3 Aug 2019 08:25:25 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-58.brq.redhat.com [10.40.204.58]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B359960BF4; Sat, 3 Aug 2019 08:25:23 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Sat, 3 Aug 2019 10:25:17 +0200 Message-Id: <20190803082517.15035-2-philmd@redhat.com> In-Reply-To: <20190803082517.15035-1-philmd@redhat.com> References: <20190803082517.15035-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Sat, 03 Aug 2019 08:25:25 +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] [PULL 1/1] Makefile: remove DESTDIR from firmware file content 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?Philippe=20Mathieu-Daud=C3=A9?= , Olaf Hering , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Laszlo Ersek Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Olaf Hering 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=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laszlo Ersek Message-Id: <20190530192812.17637-1-olaf@aepfle.de> Fixes: https://bugs.launchpad.net/qemu/+bug/1838703 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cfab1561b9..85862fb81a 100644 --- a/Makefile +++ b/Makefile @@ -881,7 +881,7 @@ ifneq ($(DESCS),) $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/firmware" set -e; tmpf=3D$$(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"; \ --=20 2.20.1