1. Patchew
  2. EDK2
  3. [edk2-devel] [Patch v2 0/2] ShellPkg: Fix IA32 build failure in acpiview
  4. View patch

[edk2-devel] [Patch v2 2/2] ShellPkg: Add shell with all commands integrated

Michael D Kinney posted 2 patches 6 years, 6 months ago
There is a newer version of this series
[edk2-devel] [Patch v2 2/2] ShellPkg: Add shell with all commands integrated
Posted by Michael D Kinney 6 years, 6 months ago 
https://bugzilla.tianocore.org/show_bug.cgi?id=1970

Update ShellPkg DSC file to build an extra version of
the Shell with all commands integrated.  This verifies
that the shell can build in this max configuration.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 ShellPkg/ShellPkg.dsc | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index 6a139b3b91..b2065dc028 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -1,7 +1,7 @@
 ##  @file
 # Shell Package
 #
-# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2018, Arm Limited. All rights reserved.<BR>
 #
 #    SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -115,6 +115,26 @@ [Components]
 !endif #$(NO_SHELL_PROFILES)
   }
 
+  #
+  # Build a second version of the shell with all commands integrated
+  #
+  ShellPkg/Application/Shell/Shell.inf {
+   <Defines>
+      FILE_GUID = EA4BB293-2D7F-4456-A681-1F22F42CD0BC
+    <PcdsFixedAtBuild>
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+    <LibraryClasses>
+      NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf
+  }
+
   ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
     <PcdsFixedAtBuild>
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#44810): https://edk2.groups.io/g/devel/message/44810
Mute This Topic: https://groups.io/mt/32683879/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch v2 2/2] ShellPkg: Add shell with all commands integrated
Posted by Gao, Zhichao 6 years, 6 months ago 
I used to use the shellpkg.dsc to build a shell.efi binary release.
Full configuration of shell is fine. But the acpiview is under developing and the shell spec doesn't contain 'acpiview' yet.
Is it OK to add an additional cmd that the spec isn't mentioned?

Thanks,
Zhichao

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Michael D Kinney
> Sent: Friday, August 2, 2019 4:56 AM
> To: devel@edk2.groups.io
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> Gao, Zhichao <zhichao.gao@intel.com>; Sami Mujawar
> <sami.mujawar@arm.com>
> Subject: [edk2-devel] [Patch v2 2/2] ShellPkg: Add shell with all commands
> integrated
> 
> https://bugzilla.tianocore.org/show_bug.cgi?id=1970
> 
> Update ShellPkg DSC file to build an extra version of the Shell with all
> commands integrated.  This verifies that the shell can build in this max
> configuration.
> 
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  ShellPkg/ShellPkg.dsc | 22 +++++++++++++++++++++-
>  1 file changed, 21 insertions(+), 1 deletion(-)
> 
> diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc index
> 6a139b3b91..b2065dc028 100644
> --- a/ShellPkg/ShellPkg.dsc
> +++ b/ShellPkg/ShellPkg.dsc
> @@ -1,7 +1,7 @@
>  ##  @file
>  # Shell Package
>  #
> -# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2007 - 2019, Intel Corporation. All rights
> +reserved.<BR>
>  # Copyright (c) 2018, Arm Limited. All rights reserved.<BR>  #
>  #    SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -115,6 +115,26 @@ [Components]
>  !endif #$(NO_SHELL_PROFILES)
>    }
> 
> +  #
> +  # Build a second version of the shell with all commands integrated  #
> + ShellPkg/Application/Shell/Shell.inf {
> +   <Defines>
> +      FILE_GUID = EA4BB293-2D7F-4456-A681-1F22F42CD0BC
> +    <PcdsFixedAtBuild>
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +    <LibraryClasses>
> +
> NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Comma
> ndsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Comma
> ndsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Comma
> ndsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Com
> mandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Com
> mandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com
> mandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
> CommandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2
> CommandsLib.inf
> +
> +
> NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCo
> m
> + mandLib.inf
> +  }
> +
> 
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> inf {
>      <PcdsFixedAtBuild>
>        gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> --
> 2.21.0.windows.1
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#44846): https://edk2.groups.io/g/devel/message/44846
Mute This Topic: https://groups.io/mt/32683879/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch v2 2/2] ShellPkg: Add shell with all commands integrated
Posted by Carsey, Jaben 6 years, 6 months ago 
I thought with this change the DSC would build 2 images. The second image would have the acpiview command and you could ignore that image for your purpose.

-Jaben

> -----Original Message-----
> From: Gao, Zhichao
> Sent: Thursday, August 1, 2019 10:36 PM
> To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> Sami Mujawar <sami.mujawar@arm.com>
> Subject: RE: [edk2-devel] [Patch v2 2/2] ShellPkg: Add shell with all
> commands integrated
> 
> I used to use the shellpkg.dsc to build a shell.efi binary release.
> Full configuration of shell is fine. But the acpiview is under developing and
> the shell spec doesn't contain 'acpiview' yet.
> Is it OK to add an additional cmd that the spec isn't mentioned?
> 
> Thanks,
> Zhichao
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> > Michael D Kinney
> > Sent: Friday, August 2, 2019 4:56 AM
> > To: devel@edk2.groups.io
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray
> > <ray.ni@intel.com>; Gao, Zhichao <zhichao.gao@intel.com>; Sami
> Mujawar
> > <sami.mujawar@arm.com>
> > Subject: [edk2-devel] [Patch v2 2/2] ShellPkg: Add shell with all
> > commands integrated
> >
> > https://bugzilla.tianocore.org/show_bug.cgi?id=1970
> >
> > Update ShellPkg DSC file to build an extra version of the Shell with
> > all commands integrated.  This verifies that the shell can build in
> > this max configuration.
> >
> > Cc: Jaben Carsey <jaben.carsey@intel.com>
> > Cc: Ray Ni <ray.ni@intel.com>
> > Cc: Zhichao Gao <zhichao.gao@intel.com>
> > Cc: Sami Mujawar <sami.mujawar@arm.com>
> > Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> > ---
> >  ShellPkg/ShellPkg.dsc | 22 +++++++++++++++++++++-
> >  1 file changed, 21 insertions(+), 1 deletion(-)
> >
> > diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc index
> > 6a139b3b91..b2065dc028 100644
> > --- a/ShellPkg/ShellPkg.dsc
> > +++ b/ShellPkg/ShellPkg.dsc
> > @@ -1,7 +1,7 @@
> >  ##  @file
> >  # Shell Package
> >  #
> > -# Copyright (c) 2007 - 2018, Intel Corporation. All rights
> > reserved.<BR>
> > +# Copyright (c) 2007 - 2019, Intel Corporation. All rights
> > +reserved.<BR>
> >  # Copyright (c) 2018, Arm Limited. All rights reserved.<BR>  #
> >  #    SPDX-License-Identifier: BSD-2-Clause-Patent
> > @@ -115,6 +115,26 @@ [Components]
> >  !endif #$(NO_SHELL_PROFILES)
> >    }
> >
> > +  #
> > +  # Build a second version of the shell with all commands integrated
> > + # ShellPkg/Application/Shell/Shell.inf {
> > +   <Defines>
> > +      FILE_GUID = EA4BB293-2D7F-4456-A681-1F22F42CD0BC
> > +    <PcdsFixedAtBuild>
> > +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > +    <LibraryClasses>
> > +
> >
> NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Comma
> > ndsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Comma
> > ndsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Comma
> > ndsLib.inf
> > +
> > NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Com
> > mandsLib.inf
> > +
> > NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Co
> > NULL|m
> > mandsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com
> > mandsLib.inf
> > +
> > NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
> > CommandsLib.inf
> > +
> > NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2
> > CommandsLib.inf
> > +
> > +
> >
> NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCo
> > m
> > + mandLib.inf
> > +  }
> > +
> >
> >
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> > inf {
> >      <PcdsFixedAtBuild>
> >        gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > --
> > 2.21.0.windows.1
> >
> >
> > 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#44862): https://edk2.groups.io/g/devel/message/44862
Mute This Topic: https://groups.io/mt/32683879/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch v2 2/2] ShellPkg: Add shell with all commands integrated
Posted by Michael D Kinney 6 years, 6 months ago 
Zhichao,

I did not modify the build of the standard Shell.  It
does not include the acpiview.

The patch builds a 2nd version of the shell with a different
FILE_GUID for build testing purposes.  I think it is very
important for the ShellPkg to have build tests for all the
content in the ShellPkg to prevent the build failure I 
saw when I simply wanted to use the acpiview command on
an IA32 system.

Thanks,

Mike

> -----Original Message-----
> From: Gao, Zhichao
> Sent: Thursday, August 1, 2019 10:36 PM
> To: devel@edk2.groups.io; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray
> <ray.ni@intel.com>; Sami Mujawar <sami.mujawar@arm.com>
> Subject: RE: [edk2-devel] [Patch v2 2/2] ShellPkg: Add
> shell with all commands integrated
> 
> I used to use the shellpkg.dsc to build a shell.efi
> binary release.
> Full configuration of shell is fine. But the acpiview
> is under developing and the shell spec doesn't contain
> 'acpiview' yet.
> Is it OK to add an additional cmd that the spec isn't
> mentioned?
> 
> Thanks,
> Zhichao
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io
> [mailto:devel@edk2.groups.io] On Behalf Of
> > Michael D Kinney
> > Sent: Friday, August 2, 2019 4:56 AM
> > To: devel@edk2.groups.io
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray
> > <ray.ni@intel.com>; Gao, Zhichao
> <zhichao.gao@intel.com>; Sami Mujawar
> > <sami.mujawar@arm.com>
> > Subject: [edk2-devel] [Patch v2 2/2] ShellPkg: Add
> shell with all
> > commands integrated
> >
> > https://bugzilla.tianocore.org/show_bug.cgi?id=1970
> >
> > Update ShellPkg DSC file to build an extra version of
> the Shell with
> > all commands integrated.  This verifies that the
> shell can build in
> > this max configuration.
> >
> > Cc: Jaben Carsey <jaben.carsey@intel.com>
> > Cc: Ray Ni <ray.ni@intel.com>
> > Cc: Zhichao Gao <zhichao.gao@intel.com>
> > Cc: Sami Mujawar <sami.mujawar@arm.com>
> > Signed-off-by: Michael D Kinney
> <michael.d.kinney@intel.com>
> > ---
> >  ShellPkg/ShellPkg.dsc | 22 +++++++++++++++++++++-
> >  1 file changed, 21 insertions(+), 1 deletion(-)
> >
> > diff --git a/ShellPkg/ShellPkg.dsc
> b/ShellPkg/ShellPkg.dsc index
> > 6a139b3b91..b2065dc028 100644
> > --- a/ShellPkg/ShellPkg.dsc
> > +++ b/ShellPkg/ShellPkg.dsc
> > @@ -1,7 +1,7 @@
> >  ##  @file
> >  # Shell Package
> >  #
> > -# Copyright (c) 2007 - 2018, Intel Corporation. All
> rights
> > reserved.<BR>
> > +# Copyright (c) 2007 - 2019, Intel Corporation. All
> rights
> > +reserved.<BR>
> >  # Copyright (c) 2018, Arm Limited. All rights
> reserved.<BR>  #
> >  #    SPDX-License-Identifier: BSD-2-Clause-Patent
> > @@ -115,6 +115,26 @@ [Components]
> >  !endif #$(NO_SHELL_PROFILES)
> >    }
> >
> > +  #
> > +  # Build a second version of the shell with all
> commands integrated
> > + # ShellPkg/Application/Shell/Shell.inf {
> > +   <Defines>
> > +      FILE_GUID = EA4BB293-2D7F-4456-A681-
> 1F22F42CD0BC
> > +    <PcdsFixedAtBuild>
> > +
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FA
> LSE
> > +    <LibraryClasses>
> > +
> >
> NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiSh
> ellLevel2Comma
> > ndsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiSh
> ellLevel1Comma
> > ndsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiSh
> ellLevel3Comma
> > ndsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiS
> hellDriver1Com
> > mandsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/Uefi
> ShellInstall1Co
> > NULL|m
> > mandsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiSh
> ellDebug1Com
> > mandsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/Uefi
> ShellNetwork1
> > CommandsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/Uefi
> ShellNetwork2
> > CommandsLib.inf
> > +
> > +
> >
> NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiS
> hellAcpiViewCo
> > m
> > + mandLib.inf
> > +  }
> > +
> >
> >
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicC
> ommand.
> > inf {
> >      <PcdsFixedAtBuild>
> >
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FA
> LSE
> > --
> > 2.21.0.windows.1
> >
> >
> > 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#44868): https://edk2.groups.io/g/devel/message/44868
Mute This Topic: https://groups.io/mt/32683879/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.