Merge branch 'master' of https://git.iszf.irk.ru/certo/build-system

.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

common.xml

@@ -197,14 +197,14 @@
  <target name="run-system-armv7">
   <exec executable="qemu-system-arm">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu cortex-a15 -m 1024 -M virt -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device sdhci-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device sd-card,drive=disk -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu cortex-a15 -m 1024 -M virt,highmem=off -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device sdhci-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device sd-card,drive=disk -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-with-secondary-armv7">
   <exec executable="qemu-system-arm">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu cortex-a15 -m 1024 -M virt -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device sdhci-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device sd-card,drive=disk -device sdhci-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device sd-card,drive=secondary -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu cortex-a15 -m 1024 -M virt,highmem=off -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device sdhci-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device sd-card,drive=disk -device sdhci-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device sd-card,drive=secondary -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
@@ -236,14 +236,14 @@
   </exec>
  </target>
 
- <target name="run-system-core2">
+ <target name="run-system-core2duo">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
    <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu core2duo ${ENABLE_KVM_X86} -m 1024 -M pc -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
- <target name="run-system-with-secondary-core2">
+ <target name="run-system-with-secondary-core2duo">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
    <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu core2duo ${ENABLE_KVM_X86} -m 1024 -M pc -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
@@ -334,6 +334,20 @@
   </exec>
  </target>
 
+ <target name="run-system-phenom">
+  <exec executable="qemu-system-x86_64">
+   <env key="QEMU_AUDIO_DRV" value="none"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu phenom -m 1024 -M pc -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
+  </exec>
+ </target>
+
+ <target name="run-system-with-secondary-phenom">
+  <exec executable="qemu-system-x86_64">
+   <env key="QEMU_AUDIO_DRV" value="none"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu phenom -m 1024 -M pc -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
+  </exec>
+ </target>
+
  <target name="run-system-opteron-g4">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
@@ -435,6 +449,62 @@ rm /lib/systemd/system/build
   </exec>
  </target>
 
+ <target name="reduce-locales">
+  <fail unless="BOARD" message="Correct machine type must be specified"/>
+  <antcall target="copy-to-secondary"/>
+  <antcall target="mount"/>
+  <antcall target="setup-reduce-locales"/>
+  <antcall target="unmount"/>
+  <antcall target="run-system-with-secondary-${BOARD}"/>
+  <antcall target="check-reduce-locales-success"/>
+  <antcall target="copy-back"/>
+ </target>
+
+ <target name="setup-reduce-locales">
+  <antcall target="setup-reduce-locales-ab"/>
+ </target>
+
+ <target name="setup-reduce-locales-ab" if="ABstart">
+  <delete file="${sysdir}/.success"/>
+  <echo file="${sysdir}/lib/systemd/system/reduce-locales.service">[Unit]
+Description=Reduce locales
+
+[Service]
+Type=oneshot
+StandardOutput=tty
+ExecStart=/lib/systemd/system/reduce-locales
+ExecStartPost=/sbin/poweroff
+
+[Install]
+WantedBy=rescue.target
+</echo>
+  <echo file="${sysdir}/lib/systemd/system/reduce-locales">#!/bin/sh
+/sbin/fsck -yf /dev/${SECONDARY}2
+/bin/mount -o discard /dev/${SECONDARY}2 /mnt
+rm /mnt/usr/lib/locale/locale-archive
+chroot mnt localedef -i en_GB -f UTF-8 en_GB.UTF-8
+/bin/umount /dev/${SECONDARY}2
+/bin/mount -o remount,rw /
+/usr/bin/touch /.success
+/bin/rm -rf /etc/systemd/system/rescue.target.wants
+/bin/rm /lib/systemd/system/reduce-locales.service
+/bin/rm /lib/systemd/system/reduce-locales
+</echo>
+  <chmod file="${sysdir}/lib/systemd/system/reduce-locales" perm="755"/>
+  <mkdir dir="${sysdir}/etc/systemd/system/rescue.target.wants"/>
+  <exec executable="ln" failonerror="true">
+   <arg line="-s /lib/systemd/system/reduce-locales.service ${sysdir}/etc/systemd/system/rescue.target.wants/reduce-locales.service"/>
+  </exec>
+ </target>
+
+ <target name="check-reduce-locales-success">
+  <antcall target="mount"/>
+  <available file="${sysdir}/.success" property="success"/>
+  <delete file="${sysdir}/.success"/>
+  <antcall target="unmount"/>
+  <fail message="Locale reduction has failed" unless="success"/>
+ </target>
+
  <target name="build-image">
   <fail unless="BOARD" message="Correct machine type must be specified"/>
   <antcall target="mount"/>

machines/CORE2DUO-Q9550/definition.xml

+<project name="Intel Core 2 Duo Q9550 machine definition">
+
+ <property name="PRETTY_NAME" value="${ant.project.name} for Intel Core 2 Duo Q9550"/>
+ <property name="CLFS_TARGET" value="x86_64-CORE2DUO_Q9550-linux-gnu"/>
+ <property name="ARCH" value="x86_64"/>
+ <property name="GCC_CROSS_CONFIG" value="--with-arch=core2 --with-tune=core2"/>
+ <property name="GCC_CONFIG" value="${GCC_CROSS_CONFIG}"/>
+ <property name="CONSOLE" value="ttyS0"/>
+ <property name="DISK_LABEL" value="mbr"/>
+ <property name="ROOT_DEVICE" value="sda"/>
+ <property name="DISK" value="${ROOT_DEVICE}"/>
+ <property name="SECONDARY" value="sdb"/>
+ <property name="BOARD" value="core2duo-q9550"/>
+ <property name="DEVICE_TYPE" value="CORE2DUOQ9550"/>
+ <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
+
+ <target name="run-system-core2duo-q9550">
+  <antcall target="run-system-core2duo"/>
+ </target>
+
+ <target name="run-system-with-secondary-core2duo-q9550">
+  <antcall target="run-system-with-secondary-core2duo"/>
+ </target>
+
+</project>

machines/I3-540/definition.xml

@@ -6,7 +6,7 @@
  <property name="GCC_CROSS_CONFIG" value="--with-arch=nehalem --with-tune=nehalem"/>
  <property name="GCC_CONFIG" value="${GCC_CROSS_CONFIG}"/>
  <property name="CONSOLE" value="ttyS0"/>
- <property name="DISK_LABEL" value="gpt"/>
+ <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>

machines/P4-630/definition.xml

@@ -17,11 +17,11 @@
  <property name="RUNTIME_WATCHDOG" value="16s"/>
 
  <target name="run-system-p4-630">
-  <antcall target="run-system-core2"/>
+  <antcall target="run-system-core2duo"/>
  </target>
 
  <target name="run-system-with-secondary-p4-630">
-  <antcall target="run-system-with-secondary-core2"/>
+  <antcall target="run-system-with-secondary-core2duo"/>
  </target>
 
 </project>

machines/QEMU-CORE2DUO/definition.xml

+<project name="QEMU Core 2 Duo machine definition">
+
+ <property name="PRETTY_NAME" value="${ant.project.name} for QEMU Core 2 Duo"/>
+ <property name="CLFS_TARGET" value="x86_64-core2duo-linux-gnu"/>
+ <property name="ARCH" value="x86_64"/>
+ <property name="GCC_CROSS_CONFIG" value="--with-arch=core2 --with-tune=core2"/>
+ <property name="GCC_CONFIG" value="${GCC_CROSS_CONFIG}"/>
+ <property name="CONSOLE" value="ttyS0"/>
+ <property name="DISK_LABEL" value="mbr"/>
+ <property name="ROOT_DEVICE" value="sda"/>
+ <property name="DISK" value="${ROOT_DEVICE}"/>
+ <property name="SECONDARY" value="sdb"/>
+ <property name="BOARD" value="qemu-core2duo"/>
+ <property name="DEVICE_TYPE" value="CORE2DUO"/>
+ <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
+
+ <target name="run-system-qemu-core2duo">
+  <antcall target="run-system-core2duo"/>
+ </target>
+
+ <target name="run-system-with-secondary-qemu-core2duo">
+  <antcall target="run-system-with-secondary-core2duo"/>
+ </target>
+
+</project>

machines/QEMU-NEHALEM/definition.xml

+<project name="QEMU Nehalem machine definition">
+
+ <property name="PRETTY_NAME" value="${ant.project.name} for QEMU Nehalem"/>
+ <property name="CLFS_TARGET" value="x86_64-nehalem-linux-gnu"/>
+ <property name="ARCH" value="x86_64"/>
+ <property name="GCC_CROSS_CONFIG" value="--with-arch=nehalem --with-tune=nehalem"/>
+ <property name="GCC_CONFIG" value="${GCC_CROSS_CONFIG}"/>
+ <property name="CONSOLE" value="ttyS0"/>
+ <property name="DISK_LABEL" value="mbr"/>
+ <property name="ROOT_DEVICE" value="sda"/>
+ <property name="DISK" value="${ROOT_DEVICE}"/>
+ <property name="SECONDARY" value="sdb"/>
+ <property name="BOARD" value="qemu-nehalem"/>
+ <property name="DEVICE_TYPE" value="NEHALEM"/>
+ <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
+
+ <target name="run-system-qemu-nehalem">
+  <antcall target="run-system-nehalem"/>
+ </target>
+
+ <target name="run-system-with-secondary-qemu-nehalem">
+  <antcall target="run-system-with-secondary-nehalem"/>
+ </target>
+
+</project>

machines/QEMU-PHENOM/definition.xml

+<project name="QEMU Phenom machine definition">
+
+ <property name="PRETTY_NAME" value="${ant.project.name} for QEMU Phenom"/>
+ <property name="CLFS_TARGET" value="x86_64-phenom-linux-gnu"/>
+ <property name="ARCH" value="x86_64"/>
+ <property name="GCC_CROSS_CONFIG" value="--with-arch=barcelona --with-tune=barcelona"/>
+ <property name="GCC_CONFIG" value="${GCC_CROSS_CONFIG}"/>
+ <property name="CONSOLE" value="ttyS0"/>
+ <property name="DISK_LABEL" value="mbr"/>
+ <property name="ROOT_DEVICE" value="sda"/>
+ <property name="DISK" value="${ROOT_DEVICE}"/>
+ <property name="SECONDARY" value="sdb"/>
+ <property name="BOARD" value="qemu-phenom"/>
+ <property name="DEVICE_TYPE" value="PHENOM"/>
+ <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
+
+ <target name="run-system-qemu-phenom">
+  <antcall target="run-system-phenom"/>
+ </target>
+
+ <target name="run-system-with-secondary-qemu-phenom">
+  <antcall target="run-system-with-secondary-phenom"/>
+ </target>
+
+</project>

machines/QEMU-SANDYBRIDGE/definition.xml

+<project name="QEMU SandyBridge machine definition">
+
+ <property name="PRETTY_NAME" value="${ant.project.name} for QEMU SandyBridge"/>
+ <property name="CLFS_TARGET" value="x86_64-sandybridge-linux-gnu"/>
+ <property name="ARCH" value="x86_64"/>
+ <property name="GCC_CROSS_CONFIG" value="--with-arch=sandybridge --with-tune=sandybridge"/>
+ <property name="GCC_CONFIG" value="${GCC_CROSS_CONFIG}"/>
+ <property name="CONSOLE" value="ttyS0"/>
+ <property name="DISK_LABEL" value="mbr"/>
+ <property name="ROOT_DEVICE" value="sda"/>
+ <property name="DISK" value="${ROOT_DEVICE}"/>
+ <property name="SECONDARY" value="sdb"/>
+ <property name="BOARD" value="qemu-sandybridge"/>
+ <property name="DEVICE_TYPE" value="SANDYBRIDGE"/>
+ <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
+
+ <target name="run-system-qemu-sandybridge">
+  <antcall target="run-system-sandybridge"/>
+ </target>
+
+ <target name="run-system-with-secondary-qemu-sandybridge">
+  <antcall target="run-system-with-secondary-sandybridge"/>
+ </target>
+
+</project>

machines/QEMU-WESTMERE/definition.xml

+<project name="QEMU Westmere machine definition">
+
+ <property name="PRETTY_NAME" value="${ant.project.name} for QEMU Westmere"/>
+ <property name="CLFS_TARGET" value="x86_64-westmere-linux-gnu"/>
+ <property name="ARCH" value="x86_64"/>
+ <property name="GCC_CROSS_CONFIG" value="--with-arch=westmere --with-tune=westmere"/>
+ <property name="GCC_CONFIG" value="${GCC_CROSS_CONFIG}"/>
+ <property name="CONSOLE" value="ttyS0"/>
+ <property name="DISK_LABEL" value="mbr"/>
+ <property name="ROOT_DEVICE" value="sda"/>
+ <property name="DISK" value="${ROOT_DEVICE}"/>
+ <property name="SECONDARY" value="sdb"/>
+ <property name="BOARD" value="qemu-westmere"/>
+ <property name="DEVICE_TYPE" value="WESTMERE"/>
+ <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
+
+ <target name="run-system-qemu-westmere">
+  <antcall target="run-system-westmere"/>
+ </target>
+
+ <target name="run-system-with-secondary-qemu-westmere">
+  <antcall target="run-system-with-secondary-westmere"/>
+ </target>
+
+</project>

machines/TERASIC-DE10-STANDARD/definition.xml

+<project name="Terasic DE10 Standard machine definition">
+
+ <property name="PRETTY_NAME" value="${ant.project.name} for Terasic DE10 Standard"/>
+ <property name="CLFS_TARGET" value="armv7-altera-linux-gnueabihf"/>
+ <property name="ARCH" value="arm"/>
+ <property name="GCC_CROSS_CONFIG" value="--with-arch=armv7-a+simd --with-tune=cortex-a9 --with-float=hard --with-fpu=neon-vfpv3"/>
+ <property name="GCC_CONFIG" value="${GCC_CROSS_CONFIG} --with-tls=gnu2"/>
+ <property name="CONSOLE" value="ttyAMA0"/>
+ <property name="DISK_LABEL" value="mbr"/>
+ <property name="ROOT_DEVICE" value="mmcblk0"/>
+ <property name="DISK" value="${ROOT_DEVICE}p"/>
+ <property name="SECONDARY" value="mmcblk1p"/>
+ <property name="BOARD" value="terasic-de10-standard"/>
+ <property name="DEVICE_TYPE" value="TerasicDE10Standard"/>
+ <property name="GOARCH" value="arm"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
+
+ <target name="run-system-terasic-de10-standard">
+  <antcall target="run-system-armv7"/>
+ </target>
+
+ <target name="run-system-with-secondary-terasic-de10-standard">
+  <antcall target="run-system-with-secondary-armv7"/>
+ </target>
+
+</project>

machines/X4-945/definition.xml

+<project name="AMD Phenom(tm) II X4 945 machine definition">
+
+ <property name="PRETTY_NAME" value="${ant.project.name} for AMD X4-945"/>
+ <property name="CLFS_TARGET" value="x86_64-X4_945-linux-gnu"/>
+ <property name="ARCH" value="x86_64"/>
+ <property name="GCC_CROSS_CONFIG" value="--with-arch=barcelona --with-tune=barcelona"/>
+ <property name="GCC_CONFIG" value="${GCC_CROSS_CONFIG}"/>
+ <property name="CONSOLE" value="ttyS0"/>
+ <property name="DISK_LABEL" value="mbr"/>
+ <property name="ROOT_DEVICE" value="sda"/>
+ <property name="DISK" value="${ROOT_DEVICE}"/>
+ <property name="SECONDARY" value="sdb"/>
+ <property name="BOARD" value="x4-945"/>
+ <property name="DEVICE_TYPE" value="X4945"/>
+ <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
+
+ <target name="run-system-x4-945">
+  <antcall target="run-system-phenom"/>
+ </target>
+
+ <target name="run-system-with-secondary-x4-945">
+  <antcall target="run-system-with-secondary-phenom"/>
+ </target>
+
+</project>

machines/XEON-5130/definition.xml

@@ -17,11 +17,11 @@
  <property name="RUNTIME_WATCHDOG" value="16s"/>
 
  <target name="run-system-xeon-5130">
-  <antcall target="run-system-core2"/>
+  <antcall target="run-system-core2duo"/>
  </target>
 
  <target name="run-system-with-secondary-xeon-5130">
-  <antcall target="run-system-with-secondary-core2"/>
+  <antcall target="run-system-with-secondary-core2duo"/>
  </target>
 
 </project>

machines/XEON-E5504/definition.xml

+<project name="Intel Xeon E5504 machine definition">
+
+ <property name="PRETTY_NAME" value="${ant.project.name} for Intel Xeon E5504"/>
+ <property name="CLFS_TARGET" value="x86_64-XEON_E5504-linux-gnu"/>
+ <property name="ARCH" value="x86_64"/>
+ <property name="GCC_CROSS_CONFIG" value="--with-arch=nehalem --with-tune=nehalem"/>
+ <property name="GCC_CONFIG" value="${GCC_CROSS_CONFIG}"/>
+ <property name="CONSOLE" value="ttyS0"/>
+ <property name="DISK_LABEL" value="mbr"/>
+ <property name="ROOT_DEVICE" value="sda"/>
+ <property name="DISK" value="${ROOT_DEVICE}"/>
+ <property name="SECONDARY" value="sdb"/>
+ <property name="BOARD" value="xeon-e5504"/>
+ <property name="DEVICE_TYPE" value="XEONE5504"/>
+ <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
+
+ <target name="run-system-xeon-e5504">
+  <antcall target="run-system-nehalem"/>
+ </target>
+
+ <target name="run-system-with-secondary-xeon-e5504">
+  <antcall target="run-system-with-secondary-nehalem"/>
+ </target>
+
+</project>

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