On 2018-10-31 23:26:38, shenglei wrote: > Remove EdkShellBinPkg in EmulatorPkg.dec and > EmulatorPkg.fdf. > https://bugzilla.tianocore.org/show_bug.cgi?id=1108 > > v2: Remove USE_OLD_SHELL in DSC because it will be > unnecessary to use it. > > Cc: Jordan Justen <[email protected]> > Cc: Ruiyu Ni <[email protected]> > Cc: Andrew Fish <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: shenglei <[email protected]>
I'm not sure if this matches the requirement in Contributions.txt, which says: "Signed-off-by" is the contributor's signature identifying them by their real/legal name and their email address. You can easily fix this by running git config. For example, in my case I run: $ git config --global user.name "Jordan Justen" After this in the future "git commit -s" will add the correct Signed-off-by automatically. If you want to use "git commit --amend" to fix the author after the user.name setting is fixed, then you'll also need --reset-author. Anyway, with the Signed-off-by fixed, the EmulatorPkg and OvmfPkg patches are: Reviewed-by: Jordan Justen <[email protected]> -Jordan > --- > EmulatorPkg/EmulatorPkg.dec | 2 +- > EmulatorPkg/EmulatorPkg.dsc | 4 ---- > EmulatorPkg/EmulatorPkg.fdf | 4 ---- > 3 files changed, 1 insertion(+), 9 deletions(-) > > diff --git a/EmulatorPkg/EmulatorPkg.dec b/EmulatorPkg/EmulatorPkg.dec > index 25f79c92c9..9be8a90e5b 100644 > --- a/EmulatorPkg/EmulatorPkg.dec > +++ b/EmulatorPkg/EmulatorPkg.dec > @@ -96,7 +96,7 @@ > > gEmulatorPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"|VOID*|0x00001001 > > gEmulatorPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window"|VOID*|0x00001018 > - > gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../../EdkShellBinPkg/bin/ia32/Apps"|VOID*|0x00001004 > + gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L"."|VOID*|0x00001004 > gEmulatorPkgTokenSpaceGuid.PcdEmuSerialPort|L"/dev/ttyS0"|VOID*|0x00001002 > gEmulatorPkgTokenSpaceGuid.PcdEmuNetworkInterface|L"en0"|VOID*|0x0000100d > > diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc > index c8c444fe1c..445777c0f3 100644 > --- a/EmulatorPkg/EmulatorPkg.dsc > +++ b/EmulatorPkg/EmulatorPkg.dsc > @@ -196,9 +196,7 @@ > # Change PcdBootManagerMenuFile to UiApp > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, > 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } > > -!ifndef $(USE_OLD_SHELL) > gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, > 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } > -!endif > > #define BOOT_WITH_FULL_CONFIGURATION 0x00 > #define BOOT_WITH_MINIMAL_CONFIGURATION 0x01 > @@ -393,7 +391,6 @@ > > FatPkg/EnhancedFatDxe/Fat.inf > > -!ifndef $(USE_OLD_SHELL) > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { > <PcdsFixedAtBuild> > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > @@ -421,7 +418,6 @@ > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 > } > -!endif > > !endif > > diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf > index 5b5f81443d..915321eb7a 100644 > --- a/EmulatorPkg/EmulatorPkg.fdf > +++ b/EmulatorPkg/EmulatorPkg.fdf > @@ -208,12 +208,8 @@ INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > INF FatPkg/EnhancedFatDxe/Fat.inf > > -!ifndef $(USE_OLD_SHELL) > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > INF ShellPkg/Application/Shell/Shell.inf > -!else > -INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf > -!endif > > [Rule.Common.SEC] > FILE SEC = $(NAMED_GUID) { > -- > 2.18.0.windows.1 > _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
