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

Makefile.common

@@ -24,10 +24,10 @@ NAME="$(PROJECT_NAME)"
 ID="$(ID)"
 
 PRETTY_NAME="$(PRETTY_NAME)"
-ANSI_COLOR=0;33
+ANSI_COLOR="0;33"
 
-VERSION=$(VERSION)
-VERSION_ID=$(BUILD_ID)
+VERSION="$(VERSION)"
+VERSION_ID="$(BUILD_ID)"
 
 # End /etc/os-release
 endef

common.xml

@@ -656,6 +656,7 @@ PRETTY_NAME="${PRETTY_NAME}"
 HOSTNAME="${HOSTNAME}"
 COPYRIGHT="${copyright}"
 LICENSE="${license}"
+TRANSLATOR="${TRANSLATOR}"
 VERSION="${VERSION}"
 BUILD_ID=${BUILD_ID}
 ARTIFACT_NAME=${ARTIFACT_NAME}
@@ -667,7 +668,7 @@ DISK="${DISK}"
 SECONDARY="${SECONDARY}"
 SHUTDOWN_WATCHDOG="${SHUTDOWN_WATCHDOG}"
 RUNTIME_WATCHDOG="${RUNTIME_WATCHDOG}"
-export LC_ALL PATH PROJECT_NAME ID PRETTY_NAME HOSTNAME COPYRIGHT LICENSE VERSION BUILD_ID ARTIFACT_NAME DEVICE_TYPE BOARD CONSOLE ROOT_DEVICE DISK SECONDARY SHUTDOWN_WATCHDOG RUNTIME_WATCHDOG HOSTTYPE
+export LC_ALL PATH PROJECT_NAME ID PRETTY_NAME HOSTNAME COPYRIGHT LICENSE TRANSLATOR VERSION BUILD_ID ARTIFACT_NAME DEVICE_TYPE BOARD CONSOLE ROOT_DEVICE DISK SECONDARY SHUTDOWN_WATCHDOG RUNTIME_WATCHDOG HOSTTYPE
 
 mount -o remount,rw /
 

machines/AMLOGIC-S905X/definition.xml

+<project name="AmLogic Meson GXL S905X machine definition">
+
+ <property name="PRETTY_NAME" value="${ant.project.name} for AmLogic Meson GXL S905X"/>
+ <property name="CLFS_TARGET" value="aarch64-amlogic-linux-gnueabi"/>
+ <property name="ARCH" value="arm64"/>
+ <property name="GCC_CROSS_CONFIG" value="--with-arch=armv8-a+crc+crypto --with-cpu=cortex-a53"/>
+ <property name="GCC_CONFIG" value="${GCC_CROSS_CONFIG}"/>
+ <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="amlogic-s905x"/>
+ <property name="DEVICE_TYPE" value="AmLogicS905X"/>
+ <property name="GOARCH" value="arm64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="15s"/>
+ <property name="RUNTIME_WATCHDOG" value="15s"/>
+
+ <target name="run-system-amlogic-s905x">
+  <antcall target="run-system-armv8"/>
+ </target>
+
+ <target name="run-system-with-secondary-amlogic-s905x">
+  <antcall target="run-system-with-secondary-armv8"/>
+ </target>
+
+</project>