Pushing broken changes (migrating to new Clover, slooooowly)

cmd/root.go

@@ -24,7 +24,6 @@ import (
 
 	"github.com/briandowns/spinner"
 	git "github.com/gogits/git-module"
-	"github.com/otiai10/copy"
 	"github.com/spf13/cobra"
 )
 
@@ -161,10 +160,6 @@ var rootCmd = &cobra.Command{
 			log.Debug("Building with arguments:", args)
 		}
 
-		// FIXME: Ditch the "git" package and just use our custom exec-based logic, so it's more consistent across the app?
-
-		// TODO: Do we just blindly run everything here, or split stuff into their own packages and/or functions here?
-
 		// Make sure that the correct directory structure exists
 		//log.Info("Verifying folder structure..")
 		Spinner.Prefix = formatSpinnerText("Verifying folder structure", false)
@@ -175,40 +170,11 @@ var rootCmd = &cobra.Command{
 		}
 		Spinner.Prefix = formatSpinnerText("Verifying folder structure", true)
 
-		// Download EDK
-		if _, err := os.Stat(util.GetEdkPath() + "/.git"); os.IsNotExist(err) {
-			// If EDK is missing and we're only supposed to build, we can't continue any further
-			if BuildOnly {
-				log.Fatal("Error: EDK is missing and using --build-only, cannot continue")
-			}
-			if InstallerOnly {
-				log.Fatal("Error: EDK is missing and using --installer-only, cannot continue")
-			}
-			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-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)
-		}
-
-		// Update EDK
-		if !BuildOnly && !InstallerOnly {
-			log.Debug("Verifying EDK is up to date..")
-			Spinner.Prefix = formatSpinnerText("Verifying EDK is up to date", false)
-			// Disable cleaning up of extra files if the NoClean flag is set
-			if !NoClean {
-				if err := runCommand("cd " + util.GetEdkPath() + " && git clean -fdx --exclude=\"Clover/\""); err != nil {
-					log.Fatal("Error: Failure detected, aborting")
-				}
-			}
-			git.Checkout(util.GetSourcePath(), git.CheckoutOptions{Branch: "EDK"})
-			Spinner.Prefix = formatSpinnerText("Verifying EDK is up to date", true)
-		}
+		// Remove any old edk2 installations
+		os.RemoveAll(util.GetSourcePath() + "/edk2")
 
 		// Download Clover
-		if _, err := os.Stat(util.GetCloverPath() + "/.svn"); os.IsNotExist(err) {
+		if _, err := os.Stat(util.GetCloverPath() + "/.git"); os.IsNotExist(err) {
 			// If Clover is missing and we're only supposed to build, we can't continue any further
 			if BuildOnly {
 				log.Fatal("Error: Clover is missing and using --build-only, cannot continue")
@@ -218,7 +184,7 @@ var rootCmd = &cobra.Command{
 			}
 			log.Debug("Clover is missing, downloading..")
 			Spinner.Prefix = formatSpinnerText("Downloading Clover", false)
-			if err := runCommand("svn co " + "https://svn.code.sf.net/p/cloverefiboot/code" + " " + util.GetCloverPath()); err != nil {
+			if err := git.Clone("https://github.com/CloverHackyColor/CloverBootloader", util.GetCloverPath(), git.CloneRepoOptions{Branch: "master", Bare: false, Quiet: Verbose}); err != nil {
 				log.Fatal("Error: Failure detected, aborting")
 			}
 			Spinner.Prefix = formatSpinnerText("Downloading Clover", true)
@@ -230,17 +196,11 @@ var rootCmd = &cobra.Command{
 			Spinner.Prefix = formatSpinnerText("Verifying Clover is up to date", false)
 			// Disable cleaning up of extra files if the NoClean flag is set
 			if !NoClean {
-				if err := runCommand("svn cleanup " + util.GetCloverPath()); err != nil {
-					log.Fatal("Error: Failure detected, aborting")
-				}
-				if err := runCommand("svn cleanup --remove-unversioned " + util.GetCloverPath()); err != nil {
-					log.Fatal("Error: Failure detected, aborting")
-				}
-				if err := runCommand("svn revert -R" + " " + util.GetCloverPath()); err != nil {
+				if err := runCommand("cd " + util.GetCloverPath() + " && git clean -fdx"); err != nil {
 					log.Fatal("Error: Failure detected, aborting")
 				}
 			}
-			if err := runCommand("svn up -r" + Revision + " " + util.GetCloverPath()); err != nil {
+			if err := git.Checkout(util.GetCloverPath(), git.CheckoutOptions{Branch: Revision}); err != nil {
 				log.Fatal("Error: Failure detected, aborting")
 			}
 			Spinner.Prefix = formatSpinnerText("Verifying Clover is up to date", true)
@@ -255,14 +215,22 @@ var rootCmd = &cobra.Command{
 			log.Debug("Overriding TOOLCHAIN_DIR..")
 			os.Setenv("TOOLCHAIN_DIR", util.GetSourcePath()+"/opt/local")
 
+			// Override TOOLCHAIN environment variable
+			// log.Debug("Overriding TOOLCHAIN..")
+			// os.Setenv("TOOLCHAIN", "XCODE8")
+
+			// Override TOOLCHAIN environment variable
+			// log.Debug("Overriding EDK_TOOLS_PATH..")
+			// os.Setenv("EDK_TOOLS_PATH", util.GetCloverPath()+"/BaseTools/BuildEnv")
+
 			// Build base tools
 			log.Debug("Building base tools..")
 			Spinner.Prefix = formatSpinnerText("Building base tools", false)
-			if err := runCommand("make -C" + " " + util.GetEdkPath() + "/BaseTools/Source/C"); err != nil {
-				if err := runCommand("make clean -C" + " " + util.GetEdkPath() + "/BaseTools/Source/C"); err != nil {
+			if err := runCommand("make -C" + " " + util.GetCloverPath() + "/BaseTools/Source/C"); err != nil {
+				if err := runCommand("make clean -C" + " " + util.GetCloverPath() + "/BaseTools/Source/C"); err != nil {
 					log.Fatal("Error: Failure detected, aborting")
 				}
-				if err := runCommand("make -C" + " " + util.GetEdkPath() + "/BaseTools/Source/C"); err != nil {
+				if err := runCommand("make -C" + " " + util.GetCloverPath() + "/BaseTools/Source/C"); err != nil {
 					log.Fatal("Error: Failure detected, aborting")
 				}
 			}
@@ -271,7 +239,7 @@ var rootCmd = &cobra.Command{
 			// Setup EDK
 			log.Debug("Setting up EDK..")
 			Spinner.Prefix = formatSpinnerText("Setting up EDK", false)
-			if err := runCommand("cd " + util.GetEdkPath() + " && " + "source edksetup.sh"); err != nil {
+			if err := runCommand("cd " + util.GetCloverPath() + " && " + "source edksetup.sh"); err != nil {
 				log.Fatal("Error: Failure detected, aborting")
 			}
 			Spinner.Prefix = formatSpinnerText("Setting up EDK", true)
@@ -317,15 +285,6 @@ var rootCmd = &cobra.Command{
 				Spinner.Prefix = formatSpinnerText("Linking nasm", true)
 			}
 
-			// Apply EDK patches
-			log.Debug("Applying patches for EDK..")
-			Spinner.Prefix = formatSpinnerText("Applying EDK patches", false)
-			copyErr := copy.Copy(util.GetCloverPath()+"/Patches_for_EDK2", util.GetEdkPath())
-			Spinner.Prefix = formatSpinnerText("Applying EDK patches", true)
-			if copyErr != nil {
-				log.Fatal("Error: Failed to copy EDK patches: ", copyErr)
-			}
-
 			// Patch Clover.dsc (eg. skip building ApfsDriverLoader)
 			log.Debug("Patching Clover build script..")
 			Spinner.Prefix = formatSpinnerText("Patching Clover build script", false)
@@ -571,7 +530,7 @@ func init() {
 	// Add persistent flags that carry over to all commands
 	rootCmd.PersistentFlags().BoolVarP(&Verbose, "verbose", "v", false, "enable verbose output")
 	rootCmd.PersistentFlags().BoolVarP(&Quiet, "quiet", "q", false, "silence all output")
-	rootCmd.PersistentFlags().StringVarP(&Revision, "revision", "r", "HEAD", "Clover target revision")
+	rootCmd.PersistentFlags().StringVarP(&Revision, "revision", "r", "master", "Clover target revision")
 	rootCmd.PersistentFlags().BoolVarP(&BuildOnly, "build-only", "b", false, "only build (no update)")
 	rootCmd.PersistentFlags().BoolVarP(&UpdateOnly, "update-only", "u", false, "only update (no build)")
 	rootCmd.PersistentFlags().BoolVarP(&InstallerOnly, "installer-only", "i", false, "only build the installer")

go.mod

@@ -8,14 +8,13 @@ require (
 	github.com/common-nighthawk/go-figure v0.0.0-20190529165535-67e0ed34491a
 	github.com/dsnet/compress v0.0.1 // indirect
 	github.com/frankban/quicktest v1.4.0 // indirect
-	github.com/gobuffalo/envy v1.7.1 // indirect
-	github.com/gobuffalo/logger v1.0.1 // indirect
-	github.com/gobuffalo/packr/v2 v2.6.0
+	github.com/gobuffalo/packr/v2 v2.7.1
 	github.com/gogits/git-module v0.0.0-20190806040916-9f607e8d6040
 	github.com/golang/protobuf v1.3.2 // indirect
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/google/go-cmp v0.3.1 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
+	github.com/karrick/godirwalk v1.12.0 // indirect
 	github.com/mattn/go-runewidth v0.0.4 // indirect
 	github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
@@ -29,6 +28,7 @@ require (
 	github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 // indirect
 	github.com/pierrec/lz4 v2.2.6+incompatible // indirect
 	github.com/rhysd/go-github-selfupdate v1.1.0
+	github.com/rogpeppe/go-internal v1.5.0 // indirect
 	github.com/sirupsen/logrus v1.4.2
 	github.com/smartystreets/assertions v1.0.1 // indirect
 	github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
@@ -37,11 +37,11 @@ require (
 	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
-	golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392
+	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
 	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
-	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
-	golang.org/x/sys v0.0.0-20190924062700-2aa67d56cdd7 // indirect
+	golang.org/x/sys v0.0.0-20191010194322-b09406accb47 // indirect
+	golang.org/x/tools v0.0.0-20191014141550-5fa5b1782b2c // indirect
 	google.golang.org/appengine v1.6.2 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0

go.sum

@@ -36,8 +36,11 @@ github.com/gobuffalo/logger v1.0.1 h1:ZEgyRGgAm4ZAhAO45YXMs5Fp+bzGLESFewzAVBMKuT
 github.com/gobuffalo/logger v1.0.1/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs=
 github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4=
 github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q=
+github.com/gobuffalo/packr v1.30.1 h1:hu1fuVR3fXEZR7rXNW3h8rqSML8EVAf6KNm0NKO/wKg=
 github.com/gobuffalo/packr/v2 v2.6.0 h1:EMUzJIb5rof6r087PtGmgdzdLKpRBESJ/8jyL9MexfY=
 github.com/gobuffalo/packr/v2 v2.6.0/go.mod h1:sgEE1xNZ6G0FNN5xn9pevVu4nywaxHvgup67xisti08=
+github.com/gobuffalo/packr/v2 v2.7.1 h1:n3CIW5T17T8v4GGK5sWXLVWJhCz7b5aNLSxW6gYim4o=
+github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc=
 github.com/gogits/git-module v0.0.0-20190806040916-9f607e8d6040 h1:aJtr52OXSanVOyAqe6haT7xWAJk3fZUHUeH67//zsds=
 github.com/gogits/git-module v0.0.0-20190806040916-9f607e8d6040/go.mod h1:oTJZlouTqkUQTWbH0xMMlMuMSHBmj7FtcxvguKfYUkE=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -72,6 +75,7 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/karrick/godirwalk v1.10.12 h1:BqUm+LuJcXjGv1d2mj3gBiQyrQ57a0rYoAmhvJQ7RDU=
 github.com/karrick/godirwalk v1.10.12/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
+github.com/karrick/godirwalk v1.12.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -128,6 +132,9 @@ github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhg
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.2 h1:XU784Pr0wdahMY2bYcyK6N1KuaRAdLtqD4qd8D18Bfs=
 github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.5.0 h1:Usqs0/lDK/NqTkvrmKSwA/3XkZAs7ZAW/eLeQ2MVBTw=
+github.com/rogpeppe/go-internal v1.5.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
@@ -175,6 +182,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 h1:ACG4HJsFiNMf47Y4PeRoebLNy/2lXT9EtprMuTFWt1M=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -183,6 +192,7 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288 h1:JIqe8uIcRBHXDQVvZtHwp80ai3Lw3IJAeJEs55Dc1W0=
@@ -210,6 +220,8 @@ golang.org/x/sys v0.0.0-20190922100055-0a153f010e69 h1:rOhMmluY6kLMhdnrivzec6lLg
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924062700-2aa67d56cdd7 h1:9Vs0Vm0p/0tnWLBWn79aav6fpcxKjBZbd21Lhxzit4k=
 golang.org/x/sys v0.0.0-20190924062700-2aa67d56cdd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -218,6 +230,10 @@ golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0 h1:Dh6fw+p6FyRl5x/FvNswO1ji0lIGzm3KP8Y9VkS9PTE=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191014141550-5fa5b1782b2c h1:PCDsQ/i3XTQEuyIMOOa9pgQZsQi3ETM+3at2Z02nBo4=
+golang.org/x/tools v0.0.0-20191014141550-5fa5b1782b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.2 h1:j8RI1yW0SkI+paT6uGwMlrMI/6zwYA6/CFil8rxOzGI=

patches/Clover.dsc.patch

@@ -1,13 +1,11 @@
 --- Clover.dsc
 +++ Clover.dsc
-@@ -352,7 +352,9 @@
+@@ -361,7 +361,7 @@
    #EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
-   #Clover/OsxMmcDxe/MmcDxe.inf
-   Clover/FileSystems/FatPkg/EnhancedFatDxe/Fat.inf
--  Clover/FileSystems/ApfsDriverLoader/ApfsDriverLoader.inf
-+  ### CLOBBER PATCH START ###
-+  # Clover/FileSystems/ApfsDriverLoader/ApfsDriverLoader.inf
-+  ### CLOBBER PATCH END   ###
+   #OsxMmcDxe/MmcDxe.inf
+   FileSystems/FatPkg/EnhancedFatDxe/Fat.inf
+-  FileSystems/ApfsDriverLoader/ApfsDriverLoader.inf
++  #FileSystems/ApfsDriverLoader/ApfsDriverLoader.inf
    # FS from grub
  !ifndef NO_GRUB_DRIVERS
-   Clover/FileSystems/GrubFS/src/EXFAT.inf
+   FileSystems/GrubFS/src/EXFAT.inf

util/root.go

@@ -34,12 +34,8 @@ func GetLogsPath() string {
 
 // GetCloverPath returns the full path to Clover
 func GetCloverPath() string {
-	return GetEdkPath() + "/Clover"
-}
-
-// GetEdkPath returns the full path to EDK
-func GetEdkPath() string {
-	return GetSourcePath() + "/edk2"
+	return GetSourcePath() + "/Clover"
+	//return GetEdkPath() + "/Clover"
 }
 
 // GetExtPath returns the full path to external packages
@@ -103,17 +99,6 @@ func GetVersionDump() string {
 	clangVersion := clangVersionSplit[0]
 	result += string(clangVersion) + "\n"
 
-	// Get EDK
-	getEdkVersionCommand := exec.Command("git", "rev-parse", "HEAD")
-	getEdkVersionCommand.Dir = GetEdkPath()
-	edkVersionOutput, edkVersionErr := getEdkVersionCommand.CombinedOutput()
-	if edkVersionErr != nil {
-		log.Fatal("Failed to get edk2 version:", edkVersionErr, string(edkVersionOutput))
-	}
-	edkVersionSplit := strings.Split(string(edkVersionOutput), "\n")
-	edkPackageVersion := edkVersionSplit[0]
-	result += "EDK2 (" + string(edkPackageVersion) + ")\n"
-
 	// Get Clover version
 	getCloverVersionCommand := exec.Command("svn", "info", "--show-item", "revision")
 	getCloverVersionCommand.Dir = GetCloverPath()