Commit d22ecae5 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Updated mender artifact to latest version

parent e0496412
......@@ -22,7 +22,7 @@
<exec executable="./make.bash" dir="${makedir}/src"/>
<move file="${builddir}/go" tofile="${builddir}/go1.4"/>
<exec executable="tar" failonerror="true">
<arg line="xf ${basedir}/build-system/packages/go/go1.8.7.src.tar.gz -C ${builddir}"/>
<arg line="xf ${basedir}/build-system/packages/go/go1.12.6.src.tar.gz -C ${builddir}"/>
</exec>
<exec executable="./make.bash" dir="${makedir}/src">
<env key="GOROOT_BOOTSTRAP" path="${builddir}/go1.4"/>
......@@ -33,16 +33,16 @@
<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}/build-system/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-3.0.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"/>
<arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact-3.0.1 ${builddir}/go/src/github.com/mendersoftware/mender-artifact"/>
</exec>
<exec executable="${builddir}/go/bin/go" dir="${builddir}/go/src/github.com/mendersoftware/mender-artifact" failonerror="true">
<arg line="build -ldflags &quot;-X main.Version=2.1.1&quot;"/>
<exec executable="${builddir}/go/bin/go" dir="${builddir}/go/src/github.com/mendersoftware/mender-artifact/cli/mender-artifact" failonerror="true">
<arg line="build -ldflags &quot;-X main.Version=3.0.1&quot;"/>
</exec>
<exec executable="mv" dir="${builddir}" failonerror="true">
<arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact/mender-artifact ${builddir}"/>
<arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact/cli/mender-artifact/mender-artifact ${builddir}"/>
</exec>
<delete dir="${builddir}/go"/>
<antcall target="mount"/>
......@@ -57,7 +57,7 @@
<arg line="if=${builddir}/disk.img of=${builddir}/${ARTIFACT_NAME}-${BUILD_ID}.ext4 bs=1048576 skip=${ABstart} count=${ABsize}"/>
</exec>
<exec executable="${builddir}/mender-artifact" dir="${builddir}" failonerror="true">
<arg line="write rootfs-image -t ${DEVICE_TYPE} -n ${ARTIFACT_NAME}-${BUILD_ID} -u ${ARTIFACT_NAME}-${BUILD_ID}.ext4 -o ${ARTIFACT_NAME}-${BUILD_ID}.mender -k ${basedir}/host/private.key -s artifactscripts"/>
<arg line="write rootfs-image -t ${DEVICE_TYPE} -n ${ARTIFACT_NAME}-${BUILD_ID} -f ${ARTIFACT_NAME}-${BUILD_ID}.ext4 -o ${ARTIFACT_NAME}-${BUILD_ID}.mender -k ${basedir}/host/private.key -s artifactscripts"/>
</exec>
<delete file="${builddir}/mender-artifact"/>
<delete file="${builddir}/${ARTIFACT_NAME}-${BUILD_ID}.ext4"/>
......@@ -77,13 +77,13 @@
<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}/build-system/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-3.0.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"/>
<arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact-3.0.1 ${builddir}/go/src/github.com/mendersoftware/mender-artifact"/>
</exec>
<exec executable="${builddir}/go/bin/go" dir="${builddir}/go/src/github.com/mendersoftware/mender-artifact" failonerror="true">
<arg line="build -ldflags &quot;-X main.Version=2.1.1&quot;"/>
<arg line="build -ldflags &quot;-X main.Version=3.0.1&quot;"/>
</exec>
<exec executable="mv" dir="${builddir}" failonerror="true">
<arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact/mender-artifact ${builddir}"/>
......
go @ 3e5b83bf
Subproject commit 338bfc1e18f54214792c81e536cbf407c698b409
Subproject commit 3e5b83bfd73445bb6edf6ee8f298074e1e5aa3af
mender-artifact @ 4c557f72
Subproject commit 08548e5ac922fb23b1f3591a58116d733da0aafa
Subproject commit 4c557f72b386419e21a8ff4ab2ea7714806b5295
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment