[edk2] [PATCH v2] ShellPkg : Add UEFI_APPLICATION module type to UefiShellInstall1CommandsLib.inf
Using UEFI_APPLICATION for all Shell app and libraries allows the use of different compiler flags for the Shell application itself and for other applications that are built separately that use Shell libraries. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Samer El-Haj-Mahmoud --- .../UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf index dc1b622..7ea306d 100644 --- a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf +++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf @@ -2,6 +2,7 @@ # Provides shell install1 functions # # Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. +# (C) Copyright 2015 Hewlett Packard Enterprise Development LP # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -16,7 +17,7 @@ INF_VERSION= 0x00010006 BASE_NAME = UefiShellInstall1CommandsLib FILE_GUID = D250E364-51C6-49ed-AEBF-6D83F5130F74 - MODULE_TYPE= UEFI_DRIVER + MODULE_TYPE= UEFI_DRIVER UEFI_APPLICATION VERSION_STRING = 1.0 LIBRARY_CLASS = NULL|UEFI_APPLICATION UEFI_DRIVER CONSTRUCTOR= ShellInstall1CommandsLibConstructor -- 2.6.3.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v2] ShellPkg : Add UEFI_APPLICATION module type to UefiShellInstall1CommandsLib.inf
Jaben, Can you please review? Thanks, --Samer -Original Message- From: El-Haj-Mahmoud, Samer Sent: Thursday, December 24, 2015 9:10 AM To: edk2-devel@lists.01.org Cc: Jaben Carsey ; Shumin Qiu ; El-Haj-Mahmoud, Samer ; El-Haj-Mahmoud, Samer Subject: [PATCH v2] ShellPkg : Add UEFI_APPLICATION module type to UefiShellInstall1CommandsLib.inf Using UEFI_APPLICATION for all Shell app and libraries allows the use of different compiler flags for the Shell application itself and for other applications that are built separately that use Shell libraries. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Samer El-Haj-Mahmoud --- .../UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf index dc1b622..7ea306d 100644 --- a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf +++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Com +++ mandsLib.inf @@ -2,6 +2,7 @@ # Provides shell install1 functions # # Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. +# (C) Copyright 2015 Hewlett Packard Enterprise Development LP # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -16,7 +17,7 @@ INF_VERSION= 0x00010006 BASE_NAME = UefiShellInstall1CommandsLib FILE_GUID = D250E364-51C6-49ed-AEBF-6D83F5130F74 - MODULE_TYPE= UEFI_DRIVER + MODULE_TYPE= UEFI_DRIVER UEFI_APPLICATION VERSION_STRING = 1.0 LIBRARY_CLASS = NULL|UEFI_APPLICATION UEFI_DRIVER CONSTRUCTOR= ShellInstall1CommandsLibConstructor -- 2.6.3.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v2] ShellPkg : Add UEFI_APPLICATION module type to UefiShellInstall1CommandsLib.inf
Reviewed-by: Jaben Carsey > -Original Message- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of El- > Haj-Mahmoud, Samer > Sent: Tuesday, January 05, 2016 10:55 AM > To: edk2-devel@lists.01.org > Cc: Carsey, Jaben ; Qiu, Shumin > > Subject: Re: [edk2] [PATCH v2] ShellPkg : Add UEFI_APPLICATION module > type to UefiShellInstall1CommandsLib.inf > Importance: High > > Jaben, > > Can you please review? > > Thanks, > --Samer > > > -Original Message- > From: El-Haj-Mahmoud, Samer > Sent: Thursday, December 24, 2015 9:10 AM > To: edk2-devel@lists.01.org > Cc: Jaben Carsey ; Shumin Qiu > ; El-Haj-Mahmoud, Samer mahm...@hpe.com>; El-Haj-Mahmoud, Samer mahm...@hpe.com> > Subject: [PATCH v2] ShellPkg : Add UEFI_APPLICATION module type to > UefiShellInstall1CommandsLib.inf > > Using UEFI_APPLICATION for all Shell app and libraries allows the use of > different compiler flags for the Shell application itself and for other > applications that are built separately that use Shell libraries. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Samer El-Haj-Mahmoud > --- > .../UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf | 3 > ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git > a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsL > ib.inf > b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Commands > Lib.inf > index dc1b622..7ea306d 100644 > --- > a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsL > ib.inf > +++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Com > +++ mandsLib.inf > @@ -2,6 +2,7 @@ > # Provides shell install1 functions > # > # Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. > +# (C) Copyright 2015 Hewlett Packard Enterprise Development LP > # > # This program and the accompanying materials # are licensed and made > available under the terms and conditions of the BSD License @@ -16,7 +17,7 > @@ >INF_VERSION= 0x00010006 >BASE_NAME = UefiShellInstall1CommandsLib >FILE_GUID = D250E364-51C6-49ed-AEBF-6D83F5130F74 > - MODULE_TYPE= UEFI_DRIVER > + MODULE_TYPE= UEFI_DRIVER UEFI_APPLICATION >VERSION_STRING = 1.0 >LIBRARY_CLASS = NULL|UEFI_APPLICATION UEFI_DRIVER >CONSTRUCTOR= ShellInstall1CommandsLibConstructor > -- > 2.6.3.windows.1 > > ___ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v2] ShellPkg : Add UEFI_APPLICATION module type to UefiShellInstall1CommandsLib.inf
On 01/05/16 22:11, Carsey, Jaben wrote: > Reviewed-by: Jaben Carsey > >> -Original Message- >> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of El- >> Haj-Mahmoud, Samer >> Sent: Tuesday, January 05, 2016 10:55 AM >> To: edk2-devel@lists.01.org >> Cc: Carsey, Jaben ; Qiu, Shumin >> >> Subject: Re: [edk2] [PATCH v2] ShellPkg : Add UEFI_APPLICATION module >> type to UefiShellInstall1CommandsLib.inf >> Importance: High >> >> Jaben, >> >> Can you please review? >> >> Thanks, >> --Samer >> >> >> -Original Message- >> From: El-Haj-Mahmoud, Samer >> Sent: Thursday, December 24, 2015 9:10 AM >> To: edk2-devel@lists.01.org >> Cc: Jaben Carsey ; Shumin Qiu >> ; El-Haj-Mahmoud, Samer > mahm...@hpe.com>; El-Haj-Mahmoud, Samer > mahm...@hpe.com> >> Subject: [PATCH v2] ShellPkg : Add UEFI_APPLICATION module type to >> UefiShellInstall1CommandsLib.inf >> >> Using UEFI_APPLICATION for all Shell app and libraries allows the use of >> different compiler flags for the Shell application itself and for other >> applications that are built separately that use Shell libraries. Less importantly, I don't understand how this is supposed to be utilized by DSC files. More importantly, this patch breaks the OVMF build for me. (In OvmfPkg and ArmVirtPkg we always build the UEFI shell from source.) The error message I get is: ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf(20): error 3001: MODULE_TYPE UEFI_DRIVER UEFI_APPLICATION is not supported for EDK II, valid values are: BASE SEC PEI_CORE PEIM DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_DRIVER UEFI_APPLICATION USER_DEFINED SMM_CORE Thanks Laszlo >> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Samer El-Haj-Mahmoud >> --- >> .../UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf | 3 >> ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git >> a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsL >> ib.inf >> b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Commands >> Lib.inf >> index dc1b622..7ea306d 100644 >> --- >> a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsL >> ib.inf >> +++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Com >> +++ mandsLib.inf >> @@ -2,6 +2,7 @@ >> # Provides shell install1 functions >> # >> # Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. >> +# (C) Copyright 2015 Hewlett Packard Enterprise Development LP >> # >> # This program and the accompanying materials # are licensed and made >> available under the terms and conditions of the BSD License @@ -16,7 +17,7 >> @@ >>INF_VERSION= 0x00010006 >>BASE_NAME = UefiShellInstall1CommandsLib >>FILE_GUID = D250E364-51C6-49ed-AEBF-6D83F5130F74 >> - MODULE_TYPE= UEFI_DRIVER >> + MODULE_TYPE= UEFI_DRIVER UEFI_APPLICATION >>VERSION_STRING = 1.0 >>LIBRARY_CLASS = NULL|UEFI_APPLICATION UEFI_DRIVER >>CONSTRUCTOR= ShellInstall1CommandsLibConstructor >> -- >> 2.6.3.windows.1 >> >> ___ >> edk2-devel mailing list >> edk2-devel@lists.01.org >> https://lists.01.org/mailman/listinfo/edk2-devel > ___ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel > ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v2] ShellPkg : Add UEFI_APPLICATION module type to UefiShellInstall1CommandsLib.inf
Thanks Laszlo. Apologies for the OVMF code break. I think it is OK to revert this change. I will re-work the original issue in our code and resubmit another patch if necessary. Could you or Shumin revert it please? Thanks, --Samer -Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Laszlo Ersek Sent: Wednesday, January 6, 2016 7:41 AM To: Carsey, Jaben ; El-Haj-Mahmoud, Samer Cc: edk2-devel@lists.01.org ; Qiu, Shumin Subject: Re: [edk2] [PATCH v2] ShellPkg : Add UEFI_APPLICATION module type to UefiShellInstall1CommandsLib.inf On 01/05/16 22:11, Carsey, Jaben wrote: > Reviewed-by: Jaben Carsey > >> -Original Message- >> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf >> Of El- Haj-Mahmoud, Samer >> Sent: Tuesday, January 05, 2016 10:55 AM >> To: edk2-devel@lists.01.org >> Cc: Carsey, Jaben ; Qiu, Shumin >> >> Subject: Re: [edk2] [PATCH v2] ShellPkg : Add UEFI_APPLICATION module >> type to UefiShellInstall1CommandsLib.inf >> Importance: High >> >> Jaben, >> >> Can you please review? >> >> Thanks, >> --Samer >> >> >> -Original Message- >> From: El-Haj-Mahmoud, Samer >> Sent: Thursday, December 24, 2015 9:10 AM >> To: edk2-devel@lists.01.org >> Cc: Jaben Carsey ; Shumin Qiu >> ; El-Haj-Mahmoud, Samer > mahm...@hpe.com>; El-Haj-Mahmoud, Samer > mahm...@hpe.com> >> Subject: [PATCH v2] ShellPkg : Add UEFI_APPLICATION module type to >> UefiShellInstall1CommandsLib.inf >> >> Using UEFI_APPLICATION for all Shell app and libraries allows the use >> of different compiler flags for the Shell application itself and for >> other applications that are built separately that use Shell libraries. Less importantly, I don't understand how this is supposed to be utilized by DSC files. More importantly, this patch breaks the OVMF build for me. (In OvmfPkg and ArmVirtPkg we always build the UEFI shell from source.) The error message I get is: ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf(20): error 3001: MODULE_TYPE UEFI_DRIVER UEFI_APPLICATION is not supported for EDK II, valid values are: BASE SEC PEI_CORE PEIM DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_DRIVER UEFI_APPLICATION USER_DEFINED SMM_CORE Thanks Laszlo >> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Samer El-Haj-Mahmoud >> --- >> .../UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf | 3 >> ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git >> a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Comm >> andsL >> ib.inf >> b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Comm >> ands >> Lib.inf >> index dc1b622..7ea306d 100644 >> --- >> a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Comm >> andsL >> ib.inf >> +++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1 >> +++ Com >> +++ mandsLib.inf >> @@ -2,6 +2,7 @@ >> # Provides shell install1 functions # # Copyright (c) 2010 - >> 2015, Intel Corporation. All rights reserved. >> +# (C) Copyright 2015 Hewlett Packard Enterprise Development LP >> # >> # This program and the accompanying materials # are licensed and >> made available under the terms and conditions of the BSD License @@ >> -16,7 +17,7 @@ >>INF_VERSION= 0x00010006 >>BASE_NAME = UefiShellInstall1CommandsLib >>FILE_GUID = D250E364-51C6-49ed-AEBF-6D83F5130F74 >> - MODULE_TYPE= UEFI_DRIVER >> + MODULE_TYPE= UEFI_DRIVER UEFI_APPLICATION >>VERSION_STRING = 1.0 >>LIBRARY_CLASS = NULL|UEFI_APPLICATION UEFI_DRIVER >>CONSTRUCTOR= ShellInstall1CommandsLibConstructor >> -- >> 2.6.3.windows.1 >> >> ___ >> edk2-devel mailing list >> edk2-devel@lists.01.org >> https://lists.01.org/mailman/listinfo/edk2-devel > ___ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel > ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v2] ShellPkg : Add UEFI_APPLICATION module type to UefiShellInstall1CommandsLib.inf
On 01/06/16 16:57, El-Haj-Mahmoud, Samer wrote: > Thanks Laszlo. Apologies for the OVMF code break. I think it is OK to revert > this change. I will re-work the original issue in our code and resubmit > another patch if necessary. > > Could you or Shumin revert it please? Reverted in SVN r19610. Thanks for the quick response! Laszlo > > Thanks, > --Samer > > -Original Message- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Laszlo > Ersek > Sent: Wednesday, January 6, 2016 7:41 AM > To: Carsey, Jaben ; El-Haj-Mahmoud, Samer > > Cc: edk2-devel@lists.01.org ; Qiu, Shumin > > Subject: Re: [edk2] [PATCH v2] ShellPkg : Add UEFI_APPLICATION module type to > UefiShellInstall1CommandsLib.inf > > On 01/05/16 22:11, Carsey, Jaben wrote: >> Reviewed-by: Jaben Carsey >> >>> -Original Message- >>> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf >>> Of El- Haj-Mahmoud, Samer >>> Sent: Tuesday, January 05, 2016 10:55 AM >>> To: edk2-devel@lists.01.org >>> Cc: Carsey, Jaben ; Qiu, Shumin >>> >>> Subject: Re: [edk2] [PATCH v2] ShellPkg : Add UEFI_APPLICATION module >>> type to UefiShellInstall1CommandsLib.inf >>> Importance: High >>> >>> Jaben, >>> >>> Can you please review? >>> >>> Thanks, >>> --Samer >>> >>> >>> -Original Message- >>> From: El-Haj-Mahmoud, Samer >>> Sent: Thursday, December 24, 2015 9:10 AM >>> To: edk2-devel@lists.01.org >>> Cc: Jaben Carsey ; Shumin Qiu >>> ; El-Haj-Mahmoud, Samer >> mahm...@hpe.com>; El-Haj-Mahmoud, Samer >> mahm...@hpe.com> >>> Subject: [PATCH v2] ShellPkg : Add UEFI_APPLICATION module type to >>> UefiShellInstall1CommandsLib.inf >>> >>> Using UEFI_APPLICATION for all Shell app and libraries allows the use >>> of different compiler flags for the Shell application itself and for >>> other applications that are built separately that use Shell libraries. > > Less importantly, I don't understand how this is supposed to be utilized by > DSC files. > > More importantly, this patch breaks the OVMF build for me. (In OvmfPkg and > ArmVirtPkg we always build the UEFI shell from source.) The error message I > get is: > > > ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf(20): > error 3001: MODULE_TYPE UEFI_DRIVER UEFI_APPLICATION is not supported for EDK > II, valid values are: > BASE SEC PEI_CORE PEIM DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER > DXE_SMM_DRIVER UEFI_DRIVER UEFI_APPLICATION USER_DEFINED SMM_CORE > > > Thanks > Laszlo > > > >>> >>> Contributed-under: TianoCore Contribution Agreement 1.0 >>> Signed-off-by: Samer El-Haj-Mahmoud >>> --- >>> .../UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf | 3 >>> ++- >>> 1 file changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git >>> a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Comm >>> andsL >>> ib.inf >>> b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Comm >>> ands >>> Lib.inf >>> index dc1b622..7ea306d 100644 >>> --- >>> a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Comm >>> andsL >>> ib.inf >>> +++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1 >>> +++ Com >>> +++ mandsLib.inf >>> @@ -2,6 +2,7 @@ >>> # Provides shell install1 functions # # Copyright (c) 2010 - >>> 2015, Intel Corporation. All rights reserved. >>> +# (C) Copyright 2015 Hewlett Packard Enterprise Development LP >>> # >>> # This program and the accompanying materials # are licensed and >>> made available under the terms and conditions of the BSD License @@ >>> -16,7 +17,7 @@ >>>INF_VERSION= 0x00010006 >>>BASE_NAME = UefiShellInstall1CommandsLib >>>FILE_GUID = D250E364-51C6-49ed-AEBF-6D83F5130F74 >>> - MODULE_TYPE= UEFI_DRIVER >>> + MODULE_TYPE= UEFI_DRIVER UEFI_APPLICATION >>>VERSION_STRING = 1.0 >>>LIBRARY_CLASS = NULL|UEFI_APPLICATION UEFI_DRIVER >>>CONSTRUCTOR= ShellInstall1CommandsLibConstructor >>> -- >>> 2.6.3.windows.1 >>> >>> ___ >>> edk2-devel mailing list >>> edk2-devel@lists.01.org >>> https://lists.01.org/mailman/listinfo/edk2-devel >> ___ >> edk2-devel mailing list >> edk2-devel@lists.01.org >> https://lists.01.org/mailman/listinfo/edk2-devel >> > > ___ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel > ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
