[PATCH 1/1] OvmfPkg/Bhyve: rename files to remove 'Pkg' infix


Rebecca Cran
 

OvmfPkg is the package, so while there are files to build bhyve
separately, they shouldn't have 'Pkg' in the name.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Peter Grehan <grehan@freebsd.org>
---
OvmfPkg/Bhyve/{BhyvePkgX64.dsc => BhyveX64.dsc} | 2 +-
OvmfPkg/Bhyve/{BhyvePkgX64.fdf => BhyveX64.fdf} | 2 +-
OvmfPkg/Bhyve/{BhyvePkgDefines.fdf.inc => BhyveDefines.fdf.inc} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename OvmfPkg/Bhyve/{BhyvePkgX64.dsc => BhyveX64.dsc} (97%)
rename OvmfPkg/Bhyve/{BhyvePkgX64.fdf => BhyveX64.fdf} (96%)
rename OvmfPkg/Bhyve/{BhyvePkgDefines.fdf.inc => BhyveDefines.fdf.inc} (100%)

diff --git a/OvmfPkg/Bhyve/BhyvePkgX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc
similarity index 97%
rename from OvmfPkg/Bhyve/BhyvePkgX64.dsc
rename to OvmfPkg/Bhyve/BhyveX64.dsc
index 99e214619be0..d2e9edfaa6b8 100644
--- a/OvmfPkg/Bhyve/BhyvePkgX64.dsc
+++ b/OvmfPkg/Bhyve/BhyveX64.dsc
@@ -22,7 +22,7 @@ [Defines]
SUPPORTED_ARCHITECTURES = X64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
- FLASH_DEFINITION = OvmfPkg/Bhyve/BhyvePkgX64.fdf
+ FLASH_DEFINITION = OvmfPkg/Bhyve/BhyveX64.fdf

#
# Defines for default states. These can be changed on the command line.
diff --git a/OvmfPkg/Bhyve/BhyvePkgX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf
similarity index 96%
rename from OvmfPkg/Bhyve/BhyvePkgX64.fdf
rename to OvmfPkg/Bhyve/BhyveX64.fdf
index d40344d523e4..5d2586ae141a 100644
--- a/OvmfPkg/Bhyve/BhyvePkgX64.fdf
+++ b/OvmfPkg/Bhyve/BhyveX64.fdf
@@ -11,7 +11,7 @@
################################################################################

[Defines]
-!include OvmfPkg/Bhyve/BhyvePkgDefines.fdf.inc
+!include OvmfPkg/Bhyve/BhyveDefines.fdf.inc

#
# Build the variable store and the firmware code as one unified flash device
diff --git a/OvmfPkg/Bhyve/BhyvePkgDefines.fdf.inc b/OvmfPkg/Bhyve/BhyveDefines.fdf.inc
similarity index 100%
rename from OvmfPkg/Bhyve/BhyvePkgDefines.fdf.inc
rename to OvmfPkg/Bhyve/BhyveDefines.fdf.inc
--
2.25.1


Laszlo Ersek
 

On 08/18/20 04:21, Peter Grehan wrote:
Reviewed-by: Peter Grehan <grehan@freebsd.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

I'll merge this after the stable tag (it's neither a feature nor a
bugfix -- I'd say it is a cleanup, and so I'd not like it to add any
noise to the feature freezes).

Thanks!
Laszlo


OvmfPkg is the package, so while there are files to build bhyve
separately, they shouldn't have 'Pkg' in the name.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Peter Grehan <grehan@freebsd.org>
---
  OvmfPkg/Bhyve/{BhyvePkgX64.dsc => BhyveX64.dsc}                 | 2 +-
  OvmfPkg/Bhyve/{BhyvePkgX64.fdf => BhyveX64.fdf}                 | 2 +-
  OvmfPkg/Bhyve/{BhyvePkgDefines.fdf.inc => BhyveDefines.fdf.inc} | 0
  3 files changed, 2 insertions(+), 2 deletions(-)
  rename OvmfPkg/Bhyve/{BhyvePkgX64.dsc => BhyveX64.dsc} (97%)
  rename OvmfPkg/Bhyve/{BhyvePkgX64.fdf => BhyveX64.fdf} (96%)
  rename OvmfPkg/Bhyve/{BhyvePkgDefines.fdf.inc =>
BhyveDefines.fdf.inc} (100%)

diff --git a/OvmfPkg/Bhyve/BhyvePkgX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc
similarity index 97%
rename from OvmfPkg/Bhyve/BhyvePkgX64.dsc
rename to OvmfPkg/Bhyve/BhyveX64.dsc
index 99e214619be0..d2e9edfaa6b8 100644
--- a/OvmfPkg/Bhyve/BhyvePkgX64.dsc
+++ b/OvmfPkg/Bhyve/BhyveX64.dsc
@@ -22,7 +22,7 @@ [Defines]
    SUPPORTED_ARCHITECTURES        = X64
    BUILD_TARGETS                  = NOOPT|DEBUG|RELEASE
    SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = OvmfPkg/Bhyve/BhyvePkgX64.fdf
+  FLASH_DEFINITION               = OvmfPkg/Bhyve/BhyveX64.fdf
      #
    # Defines for default states.  These can be changed on the command
line.
diff --git a/OvmfPkg/Bhyve/BhyvePkgX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf
similarity index 96%
rename from OvmfPkg/Bhyve/BhyvePkgX64.fdf
rename to OvmfPkg/Bhyve/BhyveX64.fdf
index d40344d523e4..5d2586ae141a 100644
--- a/OvmfPkg/Bhyve/BhyvePkgX64.fdf
+++ b/OvmfPkg/Bhyve/BhyveX64.fdf
@@ -11,7 +11,7 @@
 
################################################################################

    [Defines]
-!include OvmfPkg/Bhyve/BhyvePkgDefines.fdf.inc
+!include OvmfPkg/Bhyve/BhyveDefines.fdf.inc
    #
  # Build the variable store and the firmware code as one unified
flash device
diff --git a/OvmfPkg/Bhyve/BhyvePkgDefines.fdf.inc
b/OvmfPkg/Bhyve/BhyveDefines.fdf.inc
similarity index 100%
rename from OvmfPkg/Bhyve/BhyvePkgDefines.fdf.inc
rename to OvmfPkg/Bhyve/BhyveDefines.fdf.inc


Peter Grehan
 

Reviewed-by: Peter Grehan <grehan@freebsd.org>

OvmfPkg is the package, so while there are files to build bhyve
separately, they shouldn't have 'Pkg' in the name.
Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Peter Grehan <grehan@freebsd.org>
---
OvmfPkg/Bhyve/{BhyvePkgX64.dsc => BhyveX64.dsc} | 2 +-
OvmfPkg/Bhyve/{BhyvePkgX64.fdf => BhyveX64.fdf} | 2 +-
OvmfPkg/Bhyve/{BhyvePkgDefines.fdf.inc => BhyveDefines.fdf.inc} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename OvmfPkg/Bhyve/{BhyvePkgX64.dsc => BhyveX64.dsc} (97%)
rename OvmfPkg/Bhyve/{BhyvePkgX64.fdf => BhyveX64.fdf} (96%)
rename OvmfPkg/Bhyve/{BhyvePkgDefines.fdf.inc => BhyveDefines.fdf.inc} (100%)
diff --git a/OvmfPkg/Bhyve/BhyvePkgX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc
similarity index 97%
rename from OvmfPkg/Bhyve/BhyvePkgX64.dsc
rename to OvmfPkg/Bhyve/BhyveX64.dsc
index 99e214619be0..d2e9edfaa6b8 100644
--- a/OvmfPkg/Bhyve/BhyvePkgX64.dsc
+++ b/OvmfPkg/Bhyve/BhyveX64.dsc
@@ -22,7 +22,7 @@ [Defines]
SUPPORTED_ARCHITECTURES = X64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
- FLASH_DEFINITION = OvmfPkg/Bhyve/BhyvePkgX64.fdf
+ FLASH_DEFINITION = OvmfPkg/Bhyve/BhyveX64.fdf
#
# Defines for default states. These can be changed on the command line.
diff --git a/OvmfPkg/Bhyve/BhyvePkgX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf
similarity index 96%
rename from OvmfPkg/Bhyve/BhyvePkgX64.fdf
rename to OvmfPkg/Bhyve/BhyveX64.fdf
index d40344d523e4..5d2586ae141a 100644
--- a/OvmfPkg/Bhyve/BhyvePkgX64.fdf
+++ b/OvmfPkg/Bhyve/BhyveX64.fdf
@@ -11,7 +11,7 @@
################################################################################
[Defines]
-!include OvmfPkg/Bhyve/BhyvePkgDefines.fdf.inc
+!include OvmfPkg/Bhyve/BhyveDefines.fdf.inc
#
# Build the variable store and the firmware code as one unified flash device
diff --git a/OvmfPkg/Bhyve/BhyvePkgDefines.fdf.inc b/OvmfPkg/Bhyve/BhyveDefines.fdf.inc
similarity index 100%
rename from OvmfPkg/Bhyve/BhyvePkgDefines.fdf.inc
rename to OvmfPkg/Bhyve/BhyveDefines.fdf.inc


Laszlo Ersek
 

On 08/18/20 10:56, Laszlo Ersek wrote:
On 08/18/20 04:21, Peter Grehan wrote:
Reviewed-by: Peter Grehan <grehan@freebsd.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

I'll merge this after the stable tag (it's neither a feature nor a
bugfix -- I'd say it is a cleanup, and so I'd not like it to add any
noise to the feature freezes).
Because review completed before the (extended) SFF deadline, I've now
merged this patch. Commit hash ad40eb4e6c9d, github PR
<https://github.com/tianocore/edk2/pull/899>.

Thanks,
Laszlo