diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-13 13:06:09 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-14 10:22:37 +0000 |
| commit | f956591bbe246fae0dc4ed9b6d911bcec526463f (patch) | |
| tree | 6a0da0066d8b9850cf913287ea55872041c67411 /scripts | |
| parent | 776b174f4b54f8913933a67392f1cc3fa1085506 (diff) | |
| download | meta-boot2qt-f956591bbe246fae0dc4ed9b6d911bcec526463f.tar.gz | |
Revert "tegra: update to latest vibrante pdk"
Problems with eglfs, so revert back to previous PDK.
This reverts commit 323408406d9133a5462a24fea4ec86e649088180.
Change-Id: I3ee36809cb823aefdc03f8a24d052c2a76f308db
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/manifest.xml | 9 | ||||
| -rwxr-xr-x | scripts/setup-environment.sh | 3 | ||||
| -rwxr-xr-x | scripts/upload.sh | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index afbc05c..e6a423c 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
| @@ -69,12 +69,17 @@ | |||
| 69 | 69 | ||
| 70 | <project name="nvidia-layer" | 70 | <project name="nvidia-layer" |
| 71 | remote="playground" | 71 | remote="playground" |
| 72 | revision="7c95fabf8d71617130f71464207dd55c3079facd" | 72 | revision="38c9b1d76037ff39b9e0cbd679b3e04b36c86ed7" |
| 73 | path="sources/nvidia-layer" | 73 | path="sources/nvidia-layer" |
| 74 | groups="notdefault,internal"/> | 74 | groups="notdefault,internal"/> |
| 75 | <project name="jetson-tk1-pro" | ||
| 76 | remote="playground" | ||
| 77 | revision="a376c795d5361fda4ea5f19feecc23ab7e753646" | ||
| 78 | path="sources/jetson-tk1-pro" | ||
| 79 | groups="notdefault,internal"/> | ||
| 75 | <project name="vibrante-t186" | 80 | <project name="vibrante-t186" |
| 76 | remote="playground" | 81 | remote="playground" |
| 77 | revision="e947e8f412b41ef673714e752a4065dc2f4fb04e" | 82 | revision="edc10bf3f4b17333021f85e9ad32f85838e2c33f" |
| 78 | path="sources/vibrante-t186" | 83 | path="sources/vibrante-t186" |
| 79 | groups="notdefault,internal"/> | 84 | groups="notdefault,internal"/> |
| 80 | <project name="meta-smx6" | 85 | <project name="meta-smx6" |
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 1a72d28..5825bf1 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh | |||
| @@ -77,6 +77,9 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then | |||
| 77 | intel-corei7-64) | 77 | intel-corei7-64) |
| 78 | LAYERSCONF="bblayers.conf.intel.sample" | 78 | LAYERSCONF="bblayers.conf.intel.sample" |
| 79 | ;; | 79 | ;; |
| 80 | nvidia-logan) | ||
| 81 | LAYERSCONF="bblayers.conf.nvidia-logan.sample" | ||
| 82 | ;; | ||
| 80 | tegra-x1|tegra-t18x) | 83 | tegra-x1|tegra-t18x) |
| 81 | LAYERSCONF="bblayers.conf.nvidia-tegra.sample" | 84 | LAYERSCONF="bblayers.conf.nvidia-tegra.sample" |
| 82 | ;; | 85 | ;; |
diff --git a/scripts/upload.sh b/scripts/upload.sh index 5048797..af7e1f2 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh | |||
| @@ -41,7 +41,7 @@ elif [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img | |||
| 41 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ | 41 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ |
| 42 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \ | 42 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \ |
| 43 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf | 43 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf |
| 44 | elif ([ ${MACHINE} = "tegra-x1" ] || [ ${MACHINE} = "tegra-t18x" ]) \ | 44 | elif ([ ${MACHINE} = "nvidia-logan" ] || [ ${MACHINE} = "tegra-x1" ] || [ ${MACHINE} = "tegra-t18x" ]) \ |
| 45 | && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then | 45 | && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then |
| 46 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ | 46 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ |
| 47 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \ | 47 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \ |
