From nobody Mon Feb 9 19:47:49 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1612824818; cv=none; d=zohomail.com; s=zohoarc; b=UoYfJeGUbyAk/vBkZDF+upRa8NgTCqM9yXWSTv1Rw5nZbG0v7jGRngHXW2FhYq6R2RzITBpN41n7I0A84XfQl7eLpCAmpdPqnN+O85w4x05ycYsvSGl138PaVmVv5PlEZdjUqa8lp+ECpOwcgvxdq1NfEEYnK7Z/riWS0Csb7js= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612824818; 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; bh=vmTUdRsIp15lM+Myl5to/SGJeQnIreHQ3aMV8OYa0uU=; b=VpDABGx/2RW2eQFcgjdRq3Zix/n8AbZeqX0uf+C3D2sf77dH0O4cEigtKo9yjY1Atn5mjrSoi5tWFZPqkG9Y9Pm8xDNmlmymld5OEGOA/TTDc6q5EEQNuCouinwqDSW8mf8D2chQLWgI1TPgg8fkfThrNCzXXyffuI8vd53GRq0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1612824818454470.6144989485832; Mon, 8 Feb 2021 14:53:38 -0800 (PST) Received: from localhost ([::1]:52262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9FPV-0004F4-8T for importer@patchew.org; Mon, 08 Feb 2021 17:53:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9BCj-0003ep-S5; Mon, 08 Feb 2021 13:24:10 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:37097) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l9BCi-0006KD-3I; Mon, 08 Feb 2021 13:24:09 -0500 Received: by mail-wr1-x42f.google.com with SMTP id v15so18374129wrx.4; Mon, 08 Feb 2021 10:24:06 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id x22sm19670wmc.25.2021.02.08.10.24.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 10:24:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vmTUdRsIp15lM+Myl5to/SGJeQnIreHQ3aMV8OYa0uU=; b=K3nnvrapD2u5QnP9aOIDCODsW/wAGkjPD9+NsRO/KM9NtOENuM2HT9qr/JwLruULP5 707DvRrabBcgk1KnB+s5mSv9LXeXBnrWlLfXX/CdIL7P+r9zsAnOHhsRn2UPnYOdoNt9 2rhBsMaNFpCEGeUxb2eTs+urH1Gpl7y40H3r3p+dfKQ8h+l4ihz5xQAJhjaPLFz/XE/W eZXwmY8f1U7lEEoOaH5B/fvw1tMJ5YKGqZx6T51Ry0JoRZ8VpIKo5PQQKccrntQ0opuJ o+hqSNrZ6HvtjlEXxWlJSqRL/L1xsMqJ5RcSZCsoNi/hqLJjJMgtbP+G/pVD0ZEoLXD7 DSoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vmTUdRsIp15lM+Myl5to/SGJeQnIreHQ3aMV8OYa0uU=; b=WMRArMbT1pvmwo9Gd7oY70SNhrN6a6CZYii7lGqGhh19dMaa597uQvBPpiHLUWeZcR BcDrNeppVHPhRH6KGaWSj9XNNggd1peqSx+hND0rkQ1ivrd08jYfdDrFx64vG+RnJLvi LgZK9MVG8F70WwuF/XXLfQAloPaqHlRXpjz8cSkrz9OMns/S5DNLhab/6dTWRai+SEfs nogO97m5JN0fp4C009F5XwxbwcGPi1srKRaWJkqDyWHxMTm+fOZT63aLB8WmIhTViCbj K+SsvJoww55qeKWf0BQkcmqEHN+nmt5bgZs591CXXfw4bhF4Iv0ISq5OnBsECsvRHiJx s9Iw== X-Gm-Message-State: AOAM533rdNib9F9XDjKtmL3cUotnQblswvsIxlDE2ijFxbhEW8bTBNRX XXTmKg4l+snHF4IdRqLKNfvaf/OFVbNBvA== X-Google-Smtp-Source: ABdhPJx1o8lUysCrrNlgmSlR3ig3ng7Y9Ehaodaab+1E7/KZSW+lI+TBb9oDYDJC8vgS13a3oC21Yw== X-Received: by 2002:adf:ab10:: with SMTP id q16mr3368287wrc.376.1612808645128; Mon, 08 Feb 2021 10:24:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 34/46] pc-bios/descriptors: fix paths in json files Date: Mon, 8 Feb 2021 19:23:19 +0100 Message-Id: <20210208182331.58897-35-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210208182331.58897-1-pbonzini@redhat.com> References: <20210208182331.58897-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Jannik=20Gl=C3=BCckert?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-stable@nongnu.org, Sergei Trofimovich Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Sergei Trofimovich Before the change /usr/share/qemu/firmware/50-edk2-x86_64-secure.json contained the relative path: "filename": "share/qemu/edk2-x86_64-secure-code.fd", "filename": "share/qemu/edk2-i386-vars.fd", After then change the paths are absolute: "filename": "/usr/share/qemu/edk2-x86_64-secure-code.fd", "filename": "/usr/share/qemu/edk2-i386-vars.fd", The regression appeared in qemu-5.2.0 (seems to be related to meson port). CC: Paolo Bonzini CC: "Marc-Andr=C3=A9 Lureau" CC: "Philippe Mathieu-Daud=C3=A9" Bug: https://bugs.gentoo.org/766743 Bug: https://bugs.launchpad.net/qemu/+bug/1913012 Signed-off-by: Jannik Gl=C3=BCckert Signed-off-by: Sergei Trofimovich Message-Id: <20210131143434.2513363-1-slyfox@gentoo.org> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- pc-bios/descriptors/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.bu= ild index ac6ec66b00..29efa16d99 100644 --- a/pc-bios/descriptors/meson.build +++ b/pc-bios/descriptors/meson.build @@ -9,7 +9,7 @@ if install_edk2_blobs ] configure_file(input: files(f), output: f, - configuration: {'DATADIR': qemu_datadir}, + configuration: {'DATADIR': get_option('prefix') / qemu_= datadir}, install: get_option('install_blobs'), install_dir: qemu_datadir / 'firmware') endforeach --=20 2.29.2