[edk2] [PATCH] ShellPkg: Remove ShellPkg wrapper header files

David F. df7729 at gmail.com
Mon Dec 10 23:16:19 PST 2018


I ran in to it too, it was easy fix, the headers changed to those in MDEPKG
and the header file name changed. IIRC it was the same name minus the
leading Efi, so EfiShellParameters.h became ShellParameters.h.  I don't
have a full list but one of the notes on that change points out the new
names.

On Mon, Dec 10, 2018 at 10:57 AM Leif Lindholm <leif.lindholm at linaro.org>
wrote:

> Hi Marcin,
>
> This EDK2 patch has been pushed, making all of the Armada platforms
> stop building. Can you have a look please?
>
> Regards,
>
> Leif
>
> On Thu, Nov 15, 2018 at 03:45:28PM +0800, Shenglei Zhang wrote:
> > These wrapper header files are not referenced by all
> > open source, so they are removed.
> > https://bugzilla.tianocore.org/show_bug.cgi?id=158
> >
> > Cc: Jaben Carsey <jaben.carsey at intel.com>
> > Cc: Ruiyu Ni <ruiyu.ni at intel.com>
> > Cc: Leif Lindholm <leif.lindholm at linaro.org>
> > Cc: Ard Biesheuvel <ard.biesheuvel at linaro.org>
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Shenglei Zhang <shenglei.zhang at intel.com>
> > ---
> >  ShellPkg/Include/Protocol/EfiShell.h          | 21 -------------------
> >  .../Include/Protocol/EfiShellDynamicCommand.h | 21 -------------------
> >  .../Include/Protocol/EfiShellParameters.h     | 20 ------------------
> >  ShellPkg/Include/ShellBase.h                  | 20 ------------------
> >  4 files changed, 82 deletions(-)
> >  delete mode 100644 ShellPkg/Include/Protocol/EfiShell.h
> >  delete mode 100644 ShellPkg/Include/Protocol/EfiShellDynamicCommand.h
> >  delete mode 100644 ShellPkg/Include/Protocol/EfiShellParameters.h
> >  delete mode 100644 ShellPkg/Include/ShellBase.h
> >
> > diff --git a/ShellPkg/Include/Protocol/EfiShell.h
> b/ShellPkg/Include/Protocol/EfiShell.h
> > deleted file mode 100644
> > index 8e3c2fe4de..0000000000
> > --- a/ShellPkg/Include/Protocol/EfiShell.h
> > +++ /dev/null
> > @@ -1,21 +0,0 @@
> > -/** @file
> > -  EFI Shell protocol as defined in the UEFI Shell 2.0 specification
> including errata.
> > -
> > -  (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
> > -  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
> > -  This program and the accompanying materials
> > -  are licensed and made available under the terms and conditions of the
> BSD License
> > -  which accompanies this distribution.  The full text of the license
> may be found at
> > -  http://opensource.org/licenses/bsd-license.php
> > -
> > -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> > -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> > -
> > -**/
> > -
> > -#ifndef __EFI_SHELL_PROTOCOL_H__WRAPPER__
> > -#define __EFI_SHELL_PROTOCOL_H__WRAPPER__
> > -
> > -#include <Protocol/Shell.h>
> > -
> > -#endif
> > diff --git a/ShellPkg/Include/Protocol/EfiShellDynamicCommand.h
> b/ShellPkg/Include/Protocol/EfiShellDynamicCommand.h
> > deleted file mode 100644
> > index 50f9398ec6..0000000000
> > --- a/ShellPkg/Include/Protocol/EfiShellDynamicCommand.h
> > +++ /dev/null
> > @@ -1,21 +0,0 @@
> > -/** @file
> > -  EFI Shell Dynamic Command registration protocol
> > -
> > -  (C) Copyright 2012-2014 Hewlett-Packard Development Company, L.P.<BR>
> > -  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
> > -  This program and the accompanying materials
> > -  are licensed and made available under the terms and conditions of the
> BSD License
> > -  which accompanies this distribution.  The full text of the license
> may be found at
> > -  http://opensource.org/licenses/bsd-license.php
> > -
> > -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> > -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> > -
> > -**/
> > -
> > -#ifndef __EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL_H__WRAPPER__
> > -#define __EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL_H__WRAPPER__
> > -
> > -#include <Protocol/ShellDynamicCommand.h>
> > -
> > -#endif
> > diff --git a/ShellPkg/Include/Protocol/EfiShellParameters.h
> b/ShellPkg/Include/Protocol/EfiShellParameters.h
> > deleted file mode 100644
> > index 184b029ffa..0000000000
> > --- a/ShellPkg/Include/Protocol/EfiShellParameters.h
> > +++ /dev/null
> > @@ -1,20 +0,0 @@
> > -/** @file
> > -  EFI Shell protocol as defined in the UEFI Shell 2.0 specification.
> > -
> > -  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
> > -  This program and the accompanying materials
> > -  are licensed and made available under the terms and conditions of the
> BSD License
> > -  which accompanies this distribution.  The full text of the license
> may be found at
> > -  http://opensource.org/licenses/bsd-license.php
> > -
> > -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> > -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> > -
> > -**/
> > -
> > -#ifndef __EFI_SHELL_PARAMETERS_PROTOCOL_H__WRAPPER__
> > -#define __EFI_SHELL_PARAMETERS_PROTOCOL_H__WRAPPER__
> > -
> > -#include <Protocol/ShellParameters.h>
> > -
> > -#endif
> > diff --git a/ShellPkg/Include/ShellBase.h b/ShellPkg/Include/ShellBase.h
> > deleted file mode 100644
> > index 725ce5242f..0000000000
> > --- a/ShellPkg/Include/ShellBase.h
> > +++ /dev/null
> > @@ -1,20 +0,0 @@
> > -/** @file
> > -  Root include file for Shell Package modules that utilize the
> SHELL_RETURN type
> > -
> > -  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
> > -  This program and the accompanying materials
> > -  are licensed and made available under the terms and conditions of the
> BSD License
> > -  which accompanies this distribution.  The full text of the license
> may be found at
> > -  http://opensource.org/licenses/bsd-license.php
> > -
> > -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> > -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> > -
> > -**/
> > -
> > -#ifndef _SHELL_BASE_
> > -#define _SHELL_BASE_
> > -
> > -#include <Protocol/Shell.h>
> > -
> > -#endif //__SHELL_BASE_
> > --
> > 2.18.0.windows.1
> >
> _______________________________________________
> edk2-devel mailing list
> edk2-devel at lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
>


More information about the edk2-devel mailing list