[PATCH v1 0/2] Fix duplicated GUID

[PATCH v1 0/2] Fix duplicated GUID

[PierreGondois]

From: Pierre Gondois <Pierre.Gondois@arm.com>

Some inf modules have a duplicated GUID, triggering an error
when running a local CI. Modify the GUID of the most recent
module.

The changes can be seen at: https://github.com/PierreARM/edk2-platforms/tree/1779_Fix_duplicated_guid_v1

Pierre Gondois (2):
  Platform/ARM/Juno: Modify duplicated GUID in SmbiosPlatformDxe
  Platform/NXP: Modify duplicated GUID in ConfigurationManagerDxe

 Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf    | 2 +-
 .../ConfigurationManagerDxe/ConfigurationManagerDxe.inf         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.17.1

[PATCH v1 1/2] Platform/ARM/Juno: Modify duplicated GUID in SmbiosPlatformDxe

[PierreGondois]

From: Pierre Gondois <Pierre.Gondois@arm.com>

The two following modules have the same GUID:
 - edk2/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
 - Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf

The module in the OvmfPkg was created first. Update the GUID
of the module in the JunoPkg folder.

Change-Id: I796d8e550f50a1a4cfddd0024eb63a9565b01f42
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index f938cdf1483f..5a13605925e7 100644
--- a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -12,7 +12,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = SmbiosPlatformDxe
-  FILE_GUID                      = 4110465d-5ff3-4f4b-b580-24ed0d06747a
+  FILE_GUID                      = 3BFC114C-98F1-492E-97D1-98567E4F20D0
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
 
-- 
2.17.1

Re: [edk2-devel] [PATCH v1 1/2] Platform/ARM/Juno: Modify duplicated GUID in SmbiosPlatformDxe

[Sami Mujawar]

[-- Attachment #1: Type: text/plain, Size: 151 bytes --]

Hi Pierre,

Thank you for this patch. This update looks good to me.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

[-- Attachment #2: Type: text/html, Size: 189 bytes --]

[PATCH v1 2/2] Platform/NXP: Modify duplicated GUID in ConfigurationManagerDxe

[PierreGondois]

From: Pierre Gondois <Pierre.Gondois@arm.com>

The two following modules have the same GUID:
 - Platform/NXP/ConfigurationManagerPkg/
   ConfigurationManagerDxe/ConfigurationManagerDxe.inf
 - Platform/ARM/JunoPkg/ConfigurationManager/
   ConfigurationManagerDxe/ConfigurationManagerDxe.inf

The module in the JunoPkg was created first. Update the GUID
of the module in the NXP folder.

Change-Id: I180dd915444764ce6482206455568ddb2ab56700
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 .../ConfigurationManagerDxe/ConfigurationManagerDxe.inf         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
index 7c082cbd4202..90b4fe2eb41e 100644
--- a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
+++ b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
@@ -10,7 +10,7 @@
 [Defines]
   INF_VERSION                    = 0x0001001B
   BASE_NAME                      = ConfigurationManagerDxe
-  FILE_GUID                      = A97F70AC-3BB4-4596-B4D2-9F948EC12D17
+  FILE_GUID                      = 7437A2D1-BF1A-46BD-8774-2A4C5755808D
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
   ENTRY_POINT                    = ConfigurationManagerDxeInitialize
-- 
2.17.1

Re: [edk2-devel] [PATCH v1 2/2] Platform/NXP: Modify duplicated GUID in ConfigurationManagerDxe

[Sami Mujawar]

[-- Attachment #1: Type: text/plain, Size: 148 bytes --]

Hi Pierre,

Thank you for this patch. This fix looks good to me.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

[-- Attachment #2: Type: text/html, Size: 186 bytes --]

Re: [edk2-devel] [PATCH v1 2/2] Platform/NXP: Modify duplicated GUID in ConfigurationManagerDxe

[Sami Mujawar]

[-- Attachment #1: Type: text/plain, Size: 1061 bytes --]

Hi Leif,

Is it possible to provide your feedback for this patch, please?
I can then look at merging this series.

Regards,

Sami Mujawar

From: <devel@edk2.groups.io> on behalf of "Sami Mujawar via groups.io" <sami.mujawar=arm.com@groups.io>
Reply to: "devel@edk2.groups.io" <devel@edk2.groups.io>, Sami Mujawar <Sami.Mujawar@arm.com>
Date: Wednesday, 14 July 2021 at 15:42
To: Pierre Gondois <Pierre.Gondois@arm.com>, "devel@edk2.groups.io" <devel@edk2.groups.io>
Subject: Re: [edk2-devel] [PATCH v1 2/2] Platform/NXP: Modify duplicated GUID in ConfigurationManagerDxe

Hi Pierre,

Thank you for this patch. This fix looks good to me.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

[-- Attachment #2: Type: text/html, Size: 4046 bytes --]

Re: [PATCH v1 0/2] Fix duplicated GUID

[Leif Lindholm]

On Wed, Jun 23, 2021 at 08:37:29 +0100, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <Pierre.Gondois@arm.com>
> 
> Some inf modules have a duplicated GUID, triggering an error
> when running a local CI. Modify the GUID of the most recent
> module.
> 
> The changes can be seen at: https://github.com/PierreARM/edk2-platforms/tree/1779_Fix_duplicated_guid_v1
> 
> Pierre Gondois (2):
>   Platform/ARM/Juno: Modify duplicated GUID in SmbiosPlatformDxe
>   Platform/NXP: Modify duplicated GUID in ConfigurationManagerDxe

For the series:
Reviewed-by: Leif Lindholm <leif@nuviainc.com>

Apologies for slow reply.

> 
>  Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf    | 2 +-
>  .../ConfigurationManagerDxe/ConfigurationManagerDxe.inf         | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> -- 
> 2.17.1
> 

Re: [PATCH v1 0/2] Fix duplicated GUID

[Sami Mujawar]

Pushed as 5ba08a9b7516..b3e49860769f

Thanks.

Regards,

Sami Mujawar


On 04/08/2021 12:11 PM, Leif Lindholm wrote:
> On Wed, Jun 23, 2021 at 08:37:29 +0100, Pierre.Gondois@arm.com wrote:
>> From: Pierre Gondois <Pierre.Gondois@arm.com>
>>
>> Some inf modules have a duplicated GUID, triggering an error
>> when running a local CI. Modify the GUID of the most recent
>> module.
>>
>> The changes can be seen at: https://github.com/PierreARM/edk2-platforms/tree/1779_Fix_duplicated_guid_v1
>>
>> Pierre Gondois (2):
>>    Platform/ARM/Juno: Modify duplicated GUID in SmbiosPlatformDxe
>>    Platform/NXP: Modify duplicated GUID in ConfigurationManagerDxe
> For the series:
> Reviewed-by: Leif Lindholm <leif@nuviainc.com>
>
> Apologies for slow reply.
>
>>   Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf    | 2 +-
>>   .../ConfigurationManagerDxe/ConfigurationManagerDxe.inf         | 2 +-
>>   2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> -- 
>> 2.17.1
>>