diff options
Diffstat (limited to 'scripts/upload.sh')
-rwxr-xr-x | scripts/upload.sh | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/scripts/upload.sh b/scripts/upload.sh index 2a87217..96189ea 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh | |||
@@ -1,29 +1,37 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | ############################################################################## | 2 | ############################################################################ |
3 | ## | 3 | ## |
4 | ## Copyright (C) 2016 The Qt Company Ltd. | 4 | ## Copyright (C) 2016 The Qt Company Ltd. |
5 | ## Contact: http://www.qt.io/licensing/ | 5 | ## Contact: https://www.qt.io/licensing/ |
6 | ## | 6 | ## |
7 | ## This file is part of the Boot to Qt meta layer. | 7 | ## This file is part of the Boot to Qt meta layer. |
8 | ## | 8 | ## |
9 | ## $QT_BEGIN_LICENSE:COMM$ | 9 | ## $QT_BEGIN_LICENSE:GPL$ |
10 | ## | ||
11 | ## Commercial License Usage | 10 | ## Commercial License Usage |
12 | ## Licensees holding valid commercial Qt licenses may use this file in | 11 | ## Licensees holding valid commercial Qt licenses may use this file in |
13 | ## accordance with the commercial license agreement provided with the | 12 | ## accordance with the commercial license agreement provided with the |
14 | ## Software or, alternatively, in accordance with the terms contained in | 13 | ## Software or, alternatively, in accordance with the terms contained in |
15 | ## a written agreement between you and The Qt Company. For licensing terms | 14 | ## a written agreement between you and The Qt Company. For licensing terms |
16 | ## and conditions see http://www.qt.io/terms-conditions. For further | 15 | ## and conditions see https://www.qt.io/terms-conditions. For further |
17 | ## information use the contact form at http://www.qt.io/contact-us. | 16 | ## information use the contact form at https://www.qt.io/contact-us. |
17 | ## | ||
18 | ## GNU General Public License Usage | ||
19 | ## Alternatively, this file may be used under the terms of the GNU | ||
20 | ## General Public License version 3 or (at your option) any later version | ||
21 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
22 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
23 | ## included in the packaging of this file. Please review the following | ||
24 | ## information to ensure the GNU General Public License requirements will | ||
25 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
18 | ## | 26 | ## |
19 | ## $QT_END_LICENSE$ | 27 | ## $QT_END_LICENSE$ |
20 | ## | 28 | ## |
21 | ############################################################################## | 29 | ############################################################################ |
22 | 30 | ||
23 | set -x | 31 | set -x |
24 | set -e | 32 | set -e |
25 | 33 | ||
26 | RELEASE=5.6 | 34 | RELEASE=5.7 |
27 | UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/ | 35 | UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/ |
28 | 36 | ||
29 | if [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.hdd ]; then | 37 | if [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.hdd ]; then |
@@ -33,10 +41,11 @@ elif [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img | |||
33 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ | 41 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ |
34 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \ | 42 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \ |
35 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf | 43 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf |
36 | elif [ ${MACHINE} == "nvidia-logan" ] && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then | 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 | ||
37 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ | 46 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ |
38 | $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 \ |
39 | $PWD/tmp/deploy/images/${MACHINE}/zImage | 48 | $PWD/tmp/deploy/images/${MACHINE}/*Image |
40 | fi | 49 | fi |
41 | 50 | ||
42 | if [ -e b2qt-${PROJECT}-qt5-image-${MACHINE}.7z ]; then | 51 | if [ -e b2qt-${PROJECT}-qt5-image-${MACHINE}.7z ]; then |