Merge pull request #28618 from lheckemann/edk2-2017

edk2: 2014-12-10 -> UDK2017
This commit is contained in:
Jörg Thalheim 2017-08-28 11:03:47 +01:00 committed by GitHub
commit 0f789e7a0c
2 changed files with 7 additions and 6 deletions

View File

@ -27,7 +27,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
export OUTPUT_FD=$fd export OUTPUT_FD=$fd
for file in \ for file in \
"${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg}; "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg,FatPkg,CryptoPkg,SourceLevelDebugPkg};
do do
ln -sv "$file" . ln -sv "$file" .
done done

View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, libuuid, python2, iasl }: { stdenv, fetchFromGitHub, libuuid, python2, iasl }:
let let
pythonEnv = python2.withPackages(ps: [ps.tkinter]); pythonEnv = python2.withPackages(ps: [ps.tkinter]);
@ -13,10 +13,11 @@ else
edk2 = stdenv.mkDerivation { edk2 = stdenv.mkDerivation {
name = "edk2-2014-12-10"; name = "edk2-2014-12-10";
src = fetchgit { src = fetchFromGitHub {
url = git://github.com/tianocore/edk2; owner = "tianocore";
rev = "684a565a04"; repo = "edk2";
sha256 = "0s9ywb8w7xzlnmm4kwzykxkrdaw53b7pky121cc9wjkllzqwyxrb"; rev = "vUDK2017";
sha256 = "0sswa028644yr8fbl8j6rhrdm717fj29h4dys3ygklmjhss90a2g";
}; };
buildInputs = [ libuuid pythonEnv]; buildInputs = [ libuuid pythonEnv];