env/openbsd-amd64: install git, improve README

Updates golang/go#8642 Change-Id: Ia11faeafb96a325ff62dcf95fedb5a6489e41bd4 Reviewed-on: https://go-review.googlesource.com/2263 Reviewed-by: Minux Ma <[email protected]>
golang · Jan 3, 2015 · c6e4020 · c6e4020
1 parent 9e9c0a8
commit c6e4020
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/env/openbsd-amd64/README b/env/openbsd-amd64/README
@@ -5,11 +5,13 @@ make.bash should be run on a Linux box with qemu.
 
 After it completes, it creates a file openbsd-amd64-gce.tar.gz
 
-Upload openbsd-amd64-gce.tar.gz to gs://go-builder-data/openbsd-amd64-gce.tar.gz
-I just use the web UI at:
+Then:
+    gsutil cp -a public-read openbsd-amd64-gce.tar.gz gs://go-builder-data/openbsd-amd64-gce.tar.gz
+Or just use the web UI at:
     https://console.developers.google.com/project/symbolic-datum-552/storage/browser/go-builder-data/
 
 Then:
+   gcloud compute --project symbolic-datum-552 images delete openbsd-amd64-56
    gcloud compute --project symbolic-datum-552 images create openbsd-amd64-56 --source-uri gs://go-builder-data/openbsd-amd64-gce.tar.gz
 
 The VM needs to be run with the GCE metadata attribute "buildlet-binary-url" set to a URL

diff --git a/env/openbsd-amd64/make.bash b/env/openbsd-amd64/make.bash
@@ -17,7 +17,7 @@ fi
 mkdir -p etc
 cat >install.site <<EOF
 #!/bin/sh
-env PKG_PATH=ftp://ftp.usa.openbsd.org/pub/OpenBSD/5.6/packages/amd64 pkg_add -iv bash curl
+env PKG_PATH=ftp://ftp.usa.openbsd.org/pub/OpenBSD/5.6/packages/amd64 pkg_add -iv bash curl git
 
 # See https://code.google.com/p/google-compute-engine/issues/detail?id=77
 echo "ignore classless-static-routes;" >> /etc/dhclient.conf
@@ -202,7 +202,10 @@ send "yes\n"
 expect -timeout 600 "Location of sets\?"
 send "done\n"
 
-# Need to wait for install.site to install curl.
+expect "Ambiguous: choose dependency for git"
+send "0\n"
+
+# Need to wait for install.site to install curl, git, et
 expect -timeout 600 "CONGRATULATIONS!"
 
 expect "# "