cmd/buildlet, cmd/makemac: stop using legacy buildlet --reverse flag for Macs
Updates golang/go#21260
Change-Id: I4e2c61117cfebffd20ab4acd3ee736172c95d153
Reviewed-on: https://go-review.googlesource.com/c/build/+/205357
Reviewed-by: Bryan C. Mills <bcmills@google.com>
diff --git a/cmd/buildlet/buildlet.go b/cmd/buildlet/buildlet.go
index a9a3c75..d1d1a7d 100644
--- a/cmd/buildlet/buildlet.go
+++ b/cmd/buildlet/buildlet.go
@@ -1599,11 +1599,7 @@
log.Fatalf("unsupported sw_vers version %q", version)
}
major, minor := m[1], m[2] // "10", "12"
- if m, _ := strconv.Atoi(minor); m >= 13 {
- *reverseType = "host-darwin-10_" + minor
- } else {
- *reverse = "darwin-amd64-" + major + "_" + minor
- }
+ *reverseType = fmt.Sprintf("host-darwin-%s_%s", major, minor)
*coordinator = "farmer.golang.org:443"
// guestName is set by cmd/makemac to something like
diff --git a/cmd/makemac/makemac.go b/cmd/makemac/makemac.go
index 73aa264..b51a299 100644
--- a/cmd/makemac/makemac.go
+++ b/cmd/makemac/makemac.go
@@ -229,16 +229,9 @@
return "", fmt.Errorf("unsupported makemac minor OS X version %d", minor)
}
- builderType := fmt.Sprintf("darwin-amd64-10_%d", minor)
+ hostType := fmt.Sprintf("host-darwin-10_%d", minor)
- // Up to 10.12 we used the deprecated buildlet --reverse mode, instead of --reverse-type.
- // Starting with 10.14 (and 10.13 if we ever make a High Sierra image), we're switching
- // to the non-deprecated mode.
- if minor >= 13 {
- builderType = fmt.Sprintf("host-darwin-10_%d", minor)
- }
-
- key, err := ioutil.ReadFile(filepath.Join(os.Getenv("HOME"), "keys", builderType))
+ key, err := ioutil.ReadFile(filepath.Join(os.Getenv("HOME"), "keys", hostType))
if err != nil {
return "", err
}
@@ -281,7 +274,7 @@
"-e", "smc.present=TRUE",
"-e", "ich7m.present=TRUE",
"-e", "firmware=efi",
- "-e", fmt.Sprintf("guestinfo.key-%s=%s", builderType, strings.TrimSpace(string(key))),
+ "-e", fmt.Sprintf("guestinfo.key-%s=%s", hostType, strings.TrimSpace(string(key))),
"-e", "guestinfo.name="+name,
"-vm", name,
); err != nil {
