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

common.xml

@@ -6,6 +6,11 @@
  <property name="MACH" value="${env.MACH}"/>
  <import file="machines/${MACH}/definition.xml" optional="true"/>
 
+ <property name="imagesize" value="3839"/>
+ <property name="BootStart" value="24"/>
+ <property name="SystemStart" value="40"/>
+ <property name="secondarysize" value="6144"/>
+
  <property name="VERSION" value="${ID}-${MACH}"/>
 
  <exec executable="bash" outputproperty="LAST_COMMIT">
@@ -44,7 +49,7 @@
   <delete file="${builddir}/secondary.img"/>
  </target>
 
- <target name="copy-back-system" if="SystemStart">
+ <target name="copy-back-system" unless="ABstart">
   <exec executable="dd" failonerror="true">
    <arg line="if=${builddir}/secondary.img of=${builddir}/disk.img bs=1048576 count=${SystemStart} conv=notrunc"/>
   </exec>

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

@@ -11,6 +11,9 @@
  </fail>
  <property name="MENDER_KEYS" value="present"/>
 
+ <property name="ABstart" value="40"/>
+ <property name="ABsize" value="1836"/>
+
  <target name="build-go">
   <property name="makedir" value="${builddir}/go"/>
   <exec executable="tar" failonerror="true">