* [PATCH] ShellPkg: Remove ShellPkg wrapper header files @ 2018-11-15 7:45 Shenglei Zhang 2018-11-15 15:18 ` Carsey, Jaben 2018-12-10 18:57 ` Leif Lindholm 0 siblings, 2 replies; 5+ messages in thread From: Shenglei Zhang @ 2018-11-15 7:45 UTC (permalink / raw) To: edk2-devel; +Cc: Jaben Carsey, Ruiyu Ni, Leif Lindholm, Ard Biesheuvel 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@intel.com> Cc: Ruiyu Ni <ruiyu.ni@intel.com> Cc: Leif Lindholm <leif.lindholm@linaro.org> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Shenglei Zhang <shenglei.zhang@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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] ShellPkg: Remove ShellPkg wrapper header files 2018-11-15 7:45 [PATCH] ShellPkg: Remove ShellPkg wrapper header files Shenglei Zhang @ 2018-11-15 15:18 ` Carsey, Jaben 2018-12-10 18:57 ` Leif Lindholm 1 sibling, 0 replies; 5+ messages in thread From: Carsey, Jaben @ 2018-11-15 15:18 UTC (permalink / raw) To: Zhang, Shenglei, edk2-devel@lists.01.org Cc: Ni, Ruiyu, Leif Lindholm, Ard Biesheuvel Reviewed-by: Jaben Carsey <jaben.carsey@intel.com> > -----Original Message----- > From: Zhang, Shenglei > Sent: Wednesday, November 14, 2018 11:45 PM > To: edk2-devel@lists.01.org > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu > <ruiyu.ni@intel.com>; Leif Lindholm <leif.lindholm@linaro.org>; Ard > Biesheuvel <ard.biesheuvel@linaro.org> > Subject: [PATCH] ShellPkg: Remove ShellPkg wrapper header files > Importance: High > > 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@intel.com> > Cc: Ruiyu Ni <ruiyu.ni@intel.com> > Cc: Leif Lindholm <leif.lindholm@linaro.org> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Shenglei Zhang <shenglei.zhang@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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ShellPkg: Remove ShellPkg wrapper header files 2018-11-15 7:45 [PATCH] ShellPkg: Remove ShellPkg wrapper header files Shenglei Zhang 2018-11-15 15:18 ` Carsey, Jaben @ 2018-12-10 18:57 ` Leif Lindholm 2018-12-11 7:16 ` David F. 1 sibling, 1 reply; 5+ messages in thread From: Leif Lindholm @ 2018-12-10 18:57 UTC (permalink / raw) To: Marcin Wojtas Cc: edk2-devel, Jaben Carsey, Ruiyu Ni, Ard Biesheuvel, Shenglei Zhang 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@intel.com> > Cc: Ruiyu Ni <ruiyu.ni@intel.com> > Cc: Leif Lindholm <leif.lindholm@linaro.org> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Shenglei Zhang <shenglei.zhang@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 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ShellPkg: Remove ShellPkg wrapper header files 2018-12-10 18:57 ` Leif Lindholm @ 2018-12-11 7:16 ` David F. 2018-12-11 8:12 ` Marcin Wojtas 0 siblings, 1 reply; 5+ messages in thread From: David F. @ 2018-12-11 7:16 UTC (permalink / raw) To: leif.lindholm; +Cc: mw, Carsey, Jaben, ruiyu.ni, edk2 developers list 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@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@intel.com> > > Cc: Ruiyu Ni <ruiyu.ni@intel.com> > > Cc: Leif Lindholm <leif.lindholm@linaro.org> > > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Shenglei Zhang <shenglei.zhang@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@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ShellPkg: Remove ShellPkg wrapper header files 2018-12-11 7:16 ` David F. @ 2018-12-11 8:12 ` Marcin Wojtas 0 siblings, 0 replies; 5+ messages in thread From: Marcin Wojtas @ 2018-12-11 8:12 UTC (permalink / raw) To: df7729, Leif Lindholm; +Cc: Carsey, Jaben, Ni, Ruiyu, edk2-devel-01 Leif, David, Thanks for the heads up. I finally will have a slot for the edk2 today - will fix and submit. Best regards, Marcin wt., 11 gru 2018 o 08:16 David F. <df7729@gmail.com> napisał(a): > 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@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@intel.com> >> > Cc: Ruiyu Ni <ruiyu.ni@intel.com> >> > Cc: Leif Lindholm <leif.lindholm@linaro.org> >> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> > Contributed-under: TianoCore Contribution Agreement 1.1 >> > Signed-off-by: Shenglei Zhang <shenglei.zhang@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@lists.01.org >> https://lists.01.org/mailman/listinfo/edk2-devel >> > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-12-11 8:13 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-11-15 7:45 [PATCH] ShellPkg: Remove ShellPkg wrapper header files Shenglei Zhang 2018-11-15 15:18 ` Carsey, Jaben 2018-12-10 18:57 ` Leif Lindholm 2018-12-11 7:16 ` David F. 2018-12-11 8:12 ` Marcin Wojtas
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox