Added support for Go bootstrap

common.xml

@@ -430,12 +430,6 @@ rm /lib/systemd/system/build
   </exec>
  </target>
 
- <target name="setup-go-bootstrap">
-  <exec executable="mv" failonerror="true">
-   <arg line="-v ${builddir}/go-linux-${GOARCH}-bootstrap.tbz ${sysdir}/packages/go"/>
-  </exec>
- </target>
-
  <target name="build-image">
   <fail unless="BOARD" message="Correct machine type must be specified"/>
   <antcall target="mount"/>
@@ -444,6 +438,7 @@ rm /lib/systemd/system/build
   <antcall target="make-secondary"/>
   <antcall target="mount-secondary"/>
   <antcall target="fill-secondary"/>
+  <antcall target="setup-go-bootstrap"/>
   <antcall target="unmount"/>
   <antcall target="run-system-with-secondary-${BOARD}"/>
   <antcall target="check-build-success"/>
@@ -522,6 +517,13 @@ rm /lib/systemd/system/build
   </exec>
  </target>
 
+ <target name="setup-go-bootstrap" if="GO_BOOTSTRAP">
+  <ant antfile="packages/go/build.xml" target="go-bootstrap"/>
+  <exec executable="mv" failonerror="true">
+   <arg line="-v ${builddir}/go-linux-${GOARCH}-bootstrap.tbz ${sysdir}/packages/go"/>
+  </exec>
+ </target>
+
  <target name="build-image-www">
   <fail unless="BOARD" message="Correct machine type must be specified"/>
   <antcall target="mount"/>