Skip to content

Commit d62d0f5

Browse files
DidsDids
committed
Bumped up edk2 stable and updated dependencies (fixes compilation issues
1 parent b171a84 commit d62d0f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+2450
-635
lines changed

‎cmd/root.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,8 @@ var rootCmd = &cobra.Command{
186186
log.Debug("EDK is missing, downloading..")
187187
Spinner.Prefix = formatSpinnerText("Downloading EDK", false)
188188
// git.Clone("https://github.com/tianocore/edk2", util.GetEdkPath(), git.CloneRepoOptions{Branch: "UDK2018", Bare: false, Quiet: Verbose})
189-
git.Clone("https://github.com/tianocore/edk2", util.GetEdkPath(), git.CloneRepoOptions{Branch: "edk2-stable201903", Bare: false, Quiet: Verbose})
189+
// git.Clone("https://github.com/tianocore/edk2", util.GetEdkPath(), git.CloneRepoOptions{Branch: "edk2-stable201903", Bare: false, Quiet: Verbose})
190+
git.Clone("https://github.com/tianocore/edk2", util.GetEdkPath(), git.CloneRepoOptions{Branch: "edk2-stable201905", Bare: false, Quiet: Verbose})
190191
// git.Clone("https://github.com/acidanthera/audk", util.GetEdkPath(), git.CloneRepoOptions{Branch: "master", Bare: false, Quiet: Verbose})
191192
Spinner.Prefix = formatSpinnerText("Downloading EDK", true)
192193
}
@@ -351,10 +352,11 @@ var rootCmd = &cobra.Command{
351352
log.Fatal("Error: Failed to update extra EFI drivers: ", err)
352353
}
353354

354-
// Copy AppleUiSupport.efi
355-
if err := util.CopyFile(os.TempDir()+"AppleSupportPkg/Drivers/AppleUiSupport.efi", util.GetCloverPath()+"/CloverPackage/CloverV2/EFI/CLOVER/drivers/off/UEFI/FileVault2/AppleUiSupport.efi"); err != nil {
356-
log.Fatal("Error: Failed to update extra EFI drivers: ", err)
357-
}
355+
// Deprecated and merged into OpenCore
356+
// // Copy AppleUiSupport.efi
357+
// if err := util.CopyFile(os.TempDir()+"AppleSupportPkg/Drivers/AppleUiSupport.efi", util.GetCloverPath()+"/CloverPackage/CloverV2/EFI/CLOVER/drivers/off/UEFI/FileVault2/AppleUiSupport.efi"); err != nil {
358+
// log.Fatal("Error: Failed to update extra EFI drivers: ", err)
359+
// }
358360
// if err := util.CopyFile(os.TempDir()+"AppleSupportPkg/Drivers/AppleUiSupport.efi", util.GetCloverPath()+"/CloverPackage/CloverV2/EFI/CLOVER/drivers/off/BIOS/FileVault2/AppleUiSupport.efi"); err != nil {
359361
// log.Fatal("Error: Failed to update extra EFI drivers: ", err)
360362
// }

‎go.mod

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,29 @@ module github.com/Dids/clobber
33
go 1.12
44

55
require (
6-
cloud.google.com/go v0.43.0 // indirect
6+
cloud.google.com/go v0.45.1 // indirect
77
github.com/blang/semver v3.5.1+incompatible
88
github.com/briandowns/spinner v1.6.1
99
github.com/common-nighthawk/go-figure v0.0.0-20190529165535-67e0ed34491a
1010
github.com/coreos/bbolt v1.3.3 // indirect
11-
github.com/coreos/etcd v3.3.13+incompatible // indirect
11+
github.com/coreos/etcd v3.3.15+incompatible // indirect
1212
github.com/coreos/go-semver v0.3.0 // indirect
1313
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
1414
github.com/dsnet/compress v0.0.1 // indirect
1515
github.com/dsnet/golib v0.0.0-20190531212259-571cdbcff553 // indirect
1616
github.com/frankban/quicktest v1.4.0 // indirect
1717
github.com/go-kit/kit v0.9.0 // indirect
1818
github.com/gobuffalo/logger v1.0.1 // indirect
19-
github.com/gobuffalo/packr/v2 v2.5.2
19+
github.com/gobuffalo/packr/v2 v2.6.0
2020
github.com/gogits/git-module v0.0.0-20190806040916-9f607e8d6040
21-
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
21+
github.com/gogo/protobuf v1.3.0 // indirect
2222
github.com/golang/snappy v0.0.1 // indirect
23+
github.com/google/go-cmp v0.3.1 // indirect
2324
github.com/google/pprof v0.0.0-20190723021845-34ac40c74b70 // indirect
2425
github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
25-
github.com/grpc-ecosystem/grpc-gateway v1.9.5 // indirect
26+
github.com/gorilla/websocket v1.4.1 // indirect
27+
github.com/grpc-ecosystem/grpc-gateway v1.11.1 // indirect
2628
github.com/hashicorp/golang-lru v0.5.3 // indirect
27-
github.com/kisielk/errcheck v1.2.0 // indirect
2829
github.com/klauspost/compress v1.7.5 // indirect
2930
github.com/klauspost/cpuid v1.2.1 // indirect
3031
github.com/kr/pty v1.1.8 // indirect
@@ -47,8 +48,11 @@ require (
4748
github.com/pierrec/lz4 v2.2.6+incompatible // indirect
4849
github.com/pkg/errors v0.8.1 // indirect
4950
github.com/prometheus/client_golang v1.1.0 // indirect
51+
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
52+
github.com/prometheus/procfs v0.0.4 // indirect
5053
github.com/rhysd/go-github-selfupdate v1.1.0
5154
github.com/rogpeppe/fastuuid v1.2.0 // indirect
55+
github.com/rogpeppe/go-internal v1.3.2 // indirect
5256
github.com/russross/blackfriday v2.0.0+incompatible // indirect
5357
github.com/sirupsen/logrus v1.4.2
5458
github.com/smartystreets/assertions v1.0.1 // indirect
@@ -58,20 +62,26 @@ require (
5862
github.com/spf13/jwalterweatherman v1.1.0 // indirect
5963
github.com/spf13/viper v1.4.0 // indirect
6064
github.com/stretchr/objx v0.2.0 // indirect
65+
github.com/stretchr/testify v1.4.0 // indirect
6166
github.com/ugorji/go v1.1.7 // indirect
6267
github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e // indirect
6368
github.com/x-cray/logrus-prefixed-formatter v0.5.2
6469
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
6570
go.etcd.io/bbolt v1.3.3 // indirect
66-
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
67-
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 // indirect
68-
golang.org/x/image v0.0.0-20190802002840-cff245a6509b // indirect
69-
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 // indirect
70-
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 // indirect
71-
golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa // indirect
72-
golang.org/x/tools v0.0.0-20190805222050-c5a2fd39b72a // indirect
73-
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 // indirect
74-
google.golang.org/grpc v1.22.1 // indirect
71+
go.opencensus.io v0.22.1 // indirect
72+
golang.org/x/crypto v0.0.0-20190907121410-71b5226ff739
73+
golang.org/x/exp v0.0.0-20190829153037-c13cbed26979 // indirect
74+
golang.org/x/image v0.0.0-20190902063713-cb417be4ba39 // indirect
75+
golang.org/x/mobile v0.0.0-20190830201351-c6da95954960 // indirect
76+
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
77+
golang.org/x/sys v0.0.0-20190907184412-d223b2b6db03 // indirect
78+
golang.org/x/tools v0.0.0-20190907020128-2ca718005c18 // indirect
79+
google.golang.org/api v0.10.0 // indirect
80+
google.golang.org/appengine v1.6.2 // indirect
81+
google.golang.org/genproto v0.0.0-20190905072037-92dd089d5514 // indirect
82+
google.golang.org/grpc v1.23.0 // indirect
83+
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
7584
gopkg.in/natefinch/lumberjack.v2 v2.0.0
76-
honnef.co/go/tools v0.0.1-2019.2.2 // indirect
85+
honnef.co/go/tools v0.0.1-2019.2.3 // indirect
86+
rsc.io/binaryregexp v0.2.0 // indirect
7787
)

0 commit comments

Comments
 (0)