Skip to content

Commit

Permalink
Bumped up edk2 stable and updated dependencies (fixes compilation issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dids
Dids committed Sep 8, 2019
1 parent b171a84 commit d62d0f5
Show file tree
Hide file tree
Showing 67 changed files with 2,450 additions and 635 deletions.
12 changes: 7 additions & 5 deletions cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ var rootCmd = &cobra.Command{
log.Debug("EDK is missing, downloading..")
Spinner.Prefix = formatSpinnerText("Downloading EDK", false)
// git.Clone("https://github.com/tianocore/edk2", util.GetEdkPath(), git.CloneRepoOptions{Branch: "UDK2018", Bare: false, Quiet: Verbose})
git.Clone("https://github.com/tianocore/edk2", util.GetEdkPath(), git.CloneRepoOptions{Branch: "edk2-stable201903", Bare: false, Quiet: Verbose})
// git.Clone("https://github.com/tianocore/edk2", util.GetEdkPath(), git.CloneRepoOptions{Branch: "edk2-stable201903", Bare: false, Quiet: Verbose})
git.Clone("https://github.com/tianocore/edk2", util.GetEdkPath(), git.CloneRepoOptions{Branch: "edk2-stable201905", Bare: false, Quiet: Verbose})
// git.Clone("https://github.com/acidanthera/audk", util.GetEdkPath(), git.CloneRepoOptions{Branch: "master", Bare: false, Quiet: Verbose})
Spinner.Prefix = formatSpinnerText("Downloading EDK", true)
}
Expand Down Expand Up @@ -351,10 +352,11 @@ var rootCmd = &cobra.Command{
log.Fatal("Error: Failed to update extra EFI drivers: ", err)
}

// Copy AppleUiSupport.efi
if err := util.CopyFile(os.TempDir()+"AppleSupportPkg/Drivers/AppleUiSupport.efi", util.GetCloverPath()+"/CloverPackage/CloverV2/EFI/CLOVER/drivers/off/UEFI/FileVault2/AppleUiSupport.efi"); err != nil {
log.Fatal("Error: Failed to update extra EFI drivers: ", err)
}
// Deprecated and merged into OpenCore
// // Copy AppleUiSupport.efi
// if err := util.CopyFile(os.TempDir()+"AppleSupportPkg/Drivers/AppleUiSupport.efi", util.GetCloverPath()+"/CloverPackage/CloverV2/EFI/CLOVER/drivers/off/UEFI/FileVault2/AppleUiSupport.efi"); err != nil {
// log.Fatal("Error: Failed to update extra EFI drivers: ", err)
// }
// if err := util.CopyFile(os.TempDir()+"AppleSupportPkg/Drivers/AppleUiSupport.efi", util.GetCloverPath()+"/CloverPackage/CloverV2/EFI/CLOVER/drivers/off/BIOS/FileVault2/AppleUiSupport.efi"); err != nil {
// log.Fatal("Error: Failed to update extra EFI drivers: ", err)
// }
Expand Down
42 changes: 26 additions & 16 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,29 @@ module github.com/Dids/clobber
go 1.12

require (
cloud.google.com/go v0.43.0 // indirect
cloud.google.com/go v0.45.1 // indirect
github.com/blang/semver v3.5.1+incompatible
github.com/briandowns/spinner v1.6.1
github.com/common-nighthawk/go-figure v0.0.0-20190529165535-67e0ed34491a
github.com/coreos/bbolt v1.3.3 // indirect
github.com/coreos/etcd v3.3.13+incompatible // indirect
github.com/coreos/etcd v3.3.15+incompatible // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
github.com/dsnet/compress v0.0.1 // indirect
github.com/dsnet/golib v0.0.0-20190531212259-571cdbcff553 // indirect
github.com/frankban/quicktest v1.4.0 // indirect
github.com/go-kit/kit v0.9.0 // indirect
github.com/gobuffalo/logger v1.0.1 // indirect
github.com/gobuffalo/packr/v2 v2.5.2
github.com/gobuffalo/packr/v2 v2.6.0
github.com/gogits/git-module v0.0.0-20190806040916-9f607e8d6040
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
github.com/gogo/protobuf v1.3.0 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/go-cmp v0.3.1 // indirect
github.com/google/pprof v0.0.0-20190723021845-34ac40c74b70 // indirect
github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
github.com/grpc-ecosystem/grpc-gateway v1.9.5 // indirect
github.com/gorilla/websocket v1.4.1 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.11.1 // indirect
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/kisielk/errcheck v1.2.0 // indirect
github.com/klauspost/compress v1.7.5 // indirect
github.com/klauspost/cpuid v1.2.1 // indirect
github.com/kr/pty v1.1.8 // indirect
Expand All @@ -47,8 +48,11 @@ require (
github.com/pierrec/lz4 v2.2.6+incompatible // indirect
github.com/pkg/errors v0.8.1 // indirect
github.com/prometheus/client_golang v1.1.0 // indirect
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
github.com/prometheus/procfs v0.0.4 // indirect
github.com/rhysd/go-github-selfupdate v1.1.0
github.com/rogpeppe/fastuuid v1.2.0 // indirect
github.com/rogpeppe/go-internal v1.3.2 // indirect
github.com/russross/blackfriday v2.0.0+incompatible // indirect
github.com/sirupsen/logrus v1.4.2
github.com/smartystreets/assertions v1.0.1 // indirect
Expand All @@ -58,20 +62,26 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/viper v1.4.0 // indirect
github.com/stretchr/objx v0.2.0 // indirect
github.com/stretchr/testify v1.4.0 // indirect
github.com/ugorji/go v1.1.7 // indirect
github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e // indirect
github.com/x-cray/logrus-prefixed-formatter v0.5.2
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
go.etcd.io/bbolt v1.3.3 // indirect
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 // indirect
golang.org/x/image v0.0.0-20190802002840-cff245a6509b // indirect
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 // indirect
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 // indirect
golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa // indirect
golang.org/x/tools v0.0.0-20190805222050-c5a2fd39b72a // indirect
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 // indirect
google.golang.org/grpc v1.22.1 // indirect
go.opencensus.io v0.22.1 // indirect
golang.org/x/crypto v0.0.0-20190907121410-71b5226ff739
golang.org/x/exp v0.0.0-20190829153037-c13cbed26979 // indirect
golang.org/x/image v0.0.0-20190902063713-cb417be4ba39 // indirect
golang.org/x/mobile v0.0.0-20190830201351-c6da95954960 // indirect
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
golang.org/x/sys v0.0.0-20190907184412-d223b2b6db03 // indirect
golang.org/x/tools v0.0.0-20190907020128-2ca718005c18 // indirect
google.golang.org/api v0.10.0 // indirect
google.golang.org/appengine v1.6.2 // indirect
google.golang.org/genproto v0.0.0-20190905072037-92dd089d5514 // indirect
google.golang.org/grpc v1.23.0 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0
honnef.co/go/tools v0.0.1-2019.2.2 // indirect
honnef.co/go/tools v0.0.1-2019.2.3 // indirect
rsc.io/binaryregexp v0.2.0 // indirect
)
Loading

0 comments on commit d62d0f5

Please sign in to comment.