From nobody Mon Feb 9 10:48:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+55839+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55839+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584052570; cv=none; d=zohomail.com; s=zohoarc; b=MIg/siyMa/7eJCrZQKYWRoIihvw+7a36EMi+f1Hr8BOLUFV7AMvvN+3B2+0HJn/p+fHTKdlT54DlTMrSIsOuhSK8gNP0YMzHT13ZvvPGtGUWkwHn7UUvPqg2YI4QD0u3noYl0JDYLqgmW4o4U1ic2qdiqGDu2I1M5jFPsX8NtT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584052570; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=BM0+DeKjysXVGV+ngukkGPEPDvcvUmAY609Z8MElWNI=; b=Rgj7wl+zclv2c3rznmruSEFeFvUxJwClA+bX8gYwMQ6RewASmJx30f/8kx9WM8bzMV+FaKGKz59Oe6ScaJC9QkGOtbG+dbXOVWjFAp15IPNh5KKlN6V9wMImjK9a23f4m2XX2aw7p7BVf9vg5B7m+yzRb6/onYfj2iN+hsIPYlY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55839+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1584052570812687.7794386823645; Thu, 12 Mar 2020 15:36:10 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id B91eYY1788612xNiX8gPoGhj; Thu, 12 Mar 2020 15:36:10 -0700 X-Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.61]) by mx.groups.io with SMTP id smtpd.web11.248.1584052569757941675 for ; Thu, 12 Mar 2020 15:36:09 -0700 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-248-qcKMX3wGO7ef5RM4nlG-hA-1; Thu, 12 Mar 2020 18:36:04 -0400 X-MC-Unique: qcKMX3wGO7ef5RM4nlG-hA-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C4426107ACC9; Thu, 12 Mar 2020 22:36:02 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-117-74.ams2.redhat.com [10.36.117.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id 198791001925; Thu, 12 Mar 2020 22:36:00 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Anthony Perard , Ard Biesheuvel , Jordan Justen , Julien Grall , Leif Lindholm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [edk2-devel] [PATCH 2/2] OvmfPkg: give more telling names to some FDF include files Date: Thu, 12 Mar 2020 23:35:55 +0100 Message-Id: <20200312223555.29267-3-lersek@redhat.com> In-Reply-To: <20200312223555.29267-1-lersek@redhat.com> References: <20200312223555.29267-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com X-Gm-Message-State: ub0bmqtazIxefgMwcsJbnoatx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1584052570; bh=BM0+DeKjysXVGV+ngukkGPEPDvcvUmAY609Z8MElWNI=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=hUIoRNtSTAHiWVEJtMmHy1vTM5mR4xU9KRj2v1ze4JR5DByjWaEJC7R5vzF9h6LO9up Aa7R3FNJyA1kMU4NCMO2SWYBx9I4ODd7AGv48HnAftRNHcIGkgUmh7s2wEsBqOBGnlIBC p3GhF8ZOJB2AY84Qlyj6+G9Ebdg9k1m+Kgs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Leif suggested that FDF include files should preferably refer with their names to the FDF file sections from which they are included. Therefore - rename "OvmfPkg.fdf.inc" to "OvmfPkgDefines.fdf.inc" (included from the [Defines] section), - rename "DecomprScratchEnd.fdf.inc" to "FvmainCompactScratchEnd.fdf.inc" (included under the [FV.FVMAIN_COMPACT] section). Cc: Anthony Perard Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Julien Grall Cc: Leif Lindholm Cc: Philippe Mathieu-Daud=C3=A9 Ref: http://mid.mail-archive.com/20200312142006.GG23627@bivouac.eciton.net Ref: https://edk2.groups.io/g/devel/message/55812 Suggested-by: Leif Lindholm Signed-off-by: Laszlo Ersek --- OvmfPkg/OvmfPkgIa32.fdf | 4= ++-- OvmfPkg/OvmfPkgIa32X64.fdf | 4= ++-- OvmfPkg/OvmfPkgX64.fdf | 4= ++-- OvmfPkg/OvmfXen.fdf | 4= ++-- OvmfPkg/{DecomprScratchEnd.fdf.inc =3D> FvmainCompactScratchEnd.fdf.inc} |= 0 OvmfPkg/{OvmfPkg.fdf.inc =3D> OvmfPkgDefines.fdf.inc} |= 0 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index f1a15de365fd..da5943769352 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkg.fdf.inc +!include OvmfPkgDefines.fdf.inc =20 # # Build the variable store and the firmware code as one unified flash devi= ce @@ -397,7 +397,7 @@ [FV.FVMAIN_COMPACT] } } =20 -!include DecomprScratchEnd.fdf.inc +!include FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 9e2eb78230e9..0e2a5caaf906 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkg.fdf.inc +!include OvmfPkgDefines.fdf.inc =20 # # Build the variable store and the firmware code as one unified flash devi= ce @@ -400,7 +400,7 @@ [FV.FVMAIN_COMPACT] } } =20 -!include DecomprScratchEnd.fdf.inc +!include FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 9e2eb78230e9..0e2a5caaf906 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkg.fdf.inc +!include OvmfPkgDefines.fdf.inc =20 # # Build the variable store and the firmware code as one unified flash devi= ce @@ -400,7 +400,7 @@ [FV.FVMAIN_COMPACT] } } =20 -!include DecomprScratchEnd.fdf.inc +!include FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index 5ca8081c0265..3c4164a5f50e 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -12,7 +12,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkg.fdf.inc +!include OvmfPkgDefines.fdf.inc =20 # # This will allow the flash device image to be recognize as an ELF, with f= irst @@ -442,7 +442,7 @@ [FV.FVMAIN_COMPACT] } } =20 -!include DecomprScratchEnd.fdf.inc +!include FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/DecomprScratchEnd.fdf.inc b/OvmfPkg/FvmainCompactScrat= chEnd.fdf.inc similarity index 100% rename from OvmfPkg/DecomprScratchEnd.fdf.inc rename to OvmfPkg/FvmainCompactScratchEnd.fdf.inc diff --git a/OvmfPkg/OvmfPkg.fdf.inc b/OvmfPkg/OvmfPkgDefines.fdf.inc similarity index 100% rename from OvmfPkg/OvmfPkg.fdf.inc rename to OvmfPkg/OvmfPkgDefines.fdf.inc --=20 2.19.1.3.g30247aa5d201 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#55839): https://edk2.groups.io/g/devel/message/55839 Mute This Topic: https://groups.io/mt/71914083/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-