Packages requried for correct operation of build system should be imported as submodules

.gitmodules

+[submodule "packages/go"]
+	path = packages/go
+	url = https://git.iszf.irk.ru/certo/go.git
+[submodule "packages/mender-artifact"]
+	path = packages/mender-artifact
+	url = https://git.iszf.irk.ru/certo/mender-artifact.git

mender.xml

@@ -17,12 +17,12 @@
  <target name="build-go">
   <property name="makedir" value="${builddir}/go"/>
   <exec executable="tar" failonerror="true">
-   <arg line="xf ${basedir}/packages/go/go1.4-bootstrap-20170531.tar.gz -C ${builddir}"/>
+   <arg line="xf ${basedir}/build-system/packages/go/go1.4-bootstrap-20170531.tar.gz -C ${builddir}"/>
   </exec>
   <exec executable="./make.bash" dir="${makedir}/src"/>
   <move file="${builddir}/go" tofile="${builddir}/go1.4"/>
   <exec executable="tar" failonerror="true">
-   <arg line="xf ${basedir}/packages/go/go1.8.7.src.tar.gz -C ${builddir}"/>
+   <arg line="xf ${basedir}/build-system/packages/go/go1.8.7.src.tar.gz -C ${builddir}"/>
   </exec>
   <exec executable="./make.bash" dir="${makedir}/src">
    <env key="GOROOT_BOOTSTRAP" path="${builddir}/go1.4"/>
@@ -33,7 +33,7 @@
  <target name="build-mender-artifact" depends="build-go">
   <mkdir dir="${builddir}/go/src/github.com/mendersoftware"/>
   <exec executable="tar" dir="${builddir}" failonerror="true">
-   <arg line="xf ${basedir}/packages/mender-artifact/mender-artifact-2.1.1.tar.gz -C ${builddir}/go/src/github.com/mendersoftware"/>
+   <arg line="xf ${basedir}/build-system/packages/mender-artifact/mender-artifact-2.1.1.tar.gz -C ${builddir}/go/src/github.com/mendersoftware"/>
   </exec>
   <exec executable="mv" dir="${builddir}" failonerror="true">
    <arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact-2.1.1 ${builddir}/go/src/github.com/mendersoftware/mender-artifact"/>
@@ -65,10 +65,10 @@
  </target>
 
  <target name="post-mender-artifact" depends="build-mender-artifact" if="env.MENDER_USER">
-  <exec executable="${basedir}/packages/mender-artifact/remove-mender-artifact.sh" dir="${builddir}" failonerror="true">
+  <exec executable="${basedir}/build-system/packages/mender-artifact/remove-mender-artifact.sh" dir="${builddir}" failonerror="true">
    <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME} ${DEVICE_TYPE} ${basedir}/host/server.crt"/>
   </exec>
-  <exec executable="${basedir}/packages/mender-artifact/upload-mender-artifact.sh" dir="${builddir}" failonerror="true">
+  <exec executable="${basedir}/build-system/packages/mender-artifact/upload-mender-artifact.sh" dir="${builddir}" failonerror="true">
    <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME}-${BUILD_ID}.mender ${basedir}/host/server.crt"/>
   </exec>
   <delete file="${builddir}/${ARTIFACT_NAME}-${BUILD_ID}.mender"/>
@@ -77,7 +77,7 @@
  <target name="rebuild-mender-artifact" depends="build-go">
   <mkdir dir="${builddir}/go/src/github.com/mendersoftware"/>
   <exec executable="tar" dir="${builddir}" failonerror="true">
-   <arg line="xf ${basedir}/packages/mender-artifact/mender-artifact-2.1.1.tar.gz -C ${builddir}/go/src/github.com/mendersoftware"/>
+   <arg line="xf ${basedir}/build-system/packages/mender-artifact/mender-artifact-2.1.1.tar.gz -C ${builddir}/go/src/github.com/mendersoftware"/>
   </exec>
   <exec executable="mv" dir="${builddir}" failonerror="true">
    <arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact-2.1.1 ${builddir}/go/src/github.com/mendersoftware/mender-artifact"/>
@@ -133,10 +133,10 @@
  </target>
 
  <target name="repost-mender-artifact" depends="rebuild-mender-artifact" if="env.MENDER_USER">
-  <exec executable="${basedir}/packages/mender-artifact/remove-mender-artifact.sh" dir="${builddir}" failonerror="true">
+  <exec executable="${basedir}/build-system/packages/mender-artifact/remove-mender-artifact.sh" dir="${builddir}" failonerror="true">
    <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME} ${DEVICE_TYPE} ${basedir}/host/server.crt"/>
   </exec>
-  <exec executable="${basedir}/packages/mender-artifact/upload-mender-artifact.sh" dir="${builddir}" failonerror="true">
+  <exec executable="${basedir}/build-system/packages/mender-artifact/upload-mender-artifact.sh" dir="${builddir}" failonerror="true">
    <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME}-${BUILD_ID}.mender ${basedir}/host/server.crt"/>
   </exec>
   <delete file="${builddir}/${ARTIFACT_NAME}-${BUILD_ID}.mender"/>

go @ 338bfc1e

+Subproject commit 338bfc1e18f54214792c81e536cbf407c698b409

mender-artifact @ 08548e5a

+Subproject commit 08548e5ac922fb23b1f3591a58116d733da0aafa