From 86ce53afdeb5fbf863100231b83521bf34375930 Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Wed, 13 Apr 2016 15:47:51 +0300 Subject: Fix to NVidia's tegra configurations. Changed both nvidia-logan and tegra-t18x to use the same metalayer from the Vibrante 4.0 SDK. Kernel sources and libraries are stored into the internal CI repository. These definitions can be overridden by SDK folder using following environment variables: export KERN_DIR=~/Vibrante4.0_RC1/vibrante-t186ref-linux_src/kernel export PLATFORM_TOPDIR=~/Vibrante4.0_RC1/vibrante-t186ref-linux export TOOLCHAIN_PATH=~/Vibrante4.0_RC1/toolchains/tegra-4.9-nv export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE TOOLCHAIN_PATH KERN_DIR PLATFORM_TOPDIR" Change-Id: If58a0fcbe01daa9a55dd041b79a9d80a90fde284 Reviewed-by: Samuli Piippo --- scripts/upload.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts/upload.sh') diff --git a/scripts/upload.sh b/scripts/upload.sh index 60e7e14..fc9c837 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -33,10 +33,11 @@ elif [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \ $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf -elif [ ${MACHINE} == "nvidia-logan" || ${MACHINE} == "tegra-x1" || ${MACHINE} == "tegra-t18x" ] && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then +elif ([ ${MACHINE} = "nvidia-logan" ] || [ ${MACHINE} = "tegra-x1" ] || [ ${MACHINE} = "tegra-t18x" ]) \ + && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \ - $PWD/tmp/deploy/images/${MACHINE}/zImage + $PWD/tmp/deploy/images/${MACHINE}/*Image fi if [ -e b2qt-${PROJECT}-qt5-image-${MACHINE}.7z ]; then -- cgit v1.2.3-54-g00ecf