summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build-all.sh22
-rwxr-xr-xscripts/configure-qtcreator.sh22
-rw-r--r--scripts/manifest.xml48
-rw-r--r--scripts/manifest_jethro.xml (renamed from scripts/manifest_fido.xml)39
-rwxr-xr-xscripts/setup-environment.sh38
-rwxr-xr-xscripts/update-qt5-modules.sh22
-rwxr-xr-xscripts/upload.sh29
7 files changed, 149 insertions, 71 deletions
diff --git a/scripts/build-all.sh b/scripts/build-all.sh
index d3502ba..0b56d53 100755
--- a/scripts/build-all.sh
+++ b/scripts/build-all.sh
@@ -1,24 +1,32 @@
1#!/bin/bash 1#!/bin/bash
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
23while test -n "$1"; do 31while test -n "$1"; do
24 case "$1" in 32 case "$1" in
diff --git a/scripts/configure-qtcreator.sh b/scripts/configure-qtcreator.sh
index 1044d2a..22fd7ce 100755
--- a/scripts/configure-qtcreator.sh
+++ b/scripts/configure-qtcreator.sh
@@ -1,24 +1,32 @@
1#!/bin/bash 1#!/bin/bash
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
23set -e 31set -e
24 32
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 973aa69..ad454d1 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -11,45 +11,46 @@
11 <remote fetch="git://github.com/architech-boards" name="architech"/> 11 <remote fetch="git://github.com/architech-boards" name="architech"/>
12 <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> 12 <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
13 <remote fetch="git://code.qt.io/yocto" name="qtyocto"/> 13 <remote fetch="git://code.qt.io/yocto" name="qtyocto"/>
14 <remote fetch="ssh://codereview.qt-project.org/yocto" name="gerrit"/>
14 <remote fetch="git://git.yoctoproject.org" name="intel"/> 15 <remote fetch="git://git.yoctoproject.org" name="intel"/>
15 <remote fetch="git://github.com/openembedded" name="oe-mirror"/> 16 <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
16 <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/> 17 <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
17 18
18 <project name="poky" 19 <project name="poky"
19 remote="yocto" 20 remote="yocto"
20 revision="c9f0a99050ec0050f0dbcd55d0cd2ab18848113f" 21 revision="40376446904ae3529be41737fed9a0b650ed167d"
21 path="sources/poky"/> 22 path="sources/poky"/>
22 <project name="meta-openembedded" 23 <project name="meta-openembedded"
23 remote="oe-mirror" 24 remote="oe-mirror"
24 revision="902964a4da26e46018d2a8d17dcdda1ac4627a39" 25 revision="8ab04afbffb4bc5184cfe0655049de6f44269990"
25 path="sources/meta-openembedded"/> 26 path="sources/meta-openembedded"/>
26 <project name="meta-qt5" 27 <project name="meta-qt5"
27 remote="qtyocto" 28 remote="qtyocto"
28 revision="8d3770b5fe81d13212d84151664ceb080fc60302" 29 revision="9955f170ad32bc8d6915d1dc2b6b19a8181a6363"
29 path="sources/meta-qt5"/> 30 path="sources/meta-qt5"/>
30 <project name="meta-mingw" 31 <project name="meta-mingw"
31 remote="qtyocto" 32 remote="qtyocto"
32 path="sources/meta-mingw" 33 path="sources/meta-mingw"
33 revision="0cfd9b1a41b38a2f7c1cfcbc2abe046e3737ae31"/> 34 revision="bf2d66bbb26afbf4c22744af925daa53f61d98e1"/>
34 35
35 <project name="meta-fsl-arm" 36 <project name="meta-fsl-arm"
36 remote="yocto" 37 remote="yocto"
37 revision="c9f259a4bf8472dfa3ff75f1c3fcbe5e0ded7aaf" 38 revision="c9e576bdae8c481f5a836531c7865fe8b8a5a36f"
38 path="sources/meta-fsl-arm" 39 path="sources/meta-fsl-arm"
39 groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/> 40 groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6,renesas"/>
40 <project name="meta-ti" 41 <project name="meta-ti"
41 remote="yocto" 42 remote="yocto"
42 revision="0a222c70845d19a2213ac36803361e8531768cca" 43 revision="0da13d5a37a9d40ad6e41fe5eeeb532fef795a7a"
43 path="sources/meta-ti" 44 path="sources/meta-ti"
44 groups="notdefault,external,ti,bbb"/> 45 groups="notdefault,external,ti,bbb"/>
45 <project name="meta-raspberrypi" 46 <project name="meta-raspberrypi"
46 remote="yocto" 47 remote="yocto"
47 revision="a42a1706de91ed03ae8798c7f9e70c30cebcf7de" 48 revision="e82417d33b8147f65141ef937d56735d80ee7207"
48 path="sources/meta-raspberrypi" 49 path="sources/meta-raspberrypi"
49 groups="notdefault,external,rpi"/> 50 groups="notdefault,external,rpi"/>
50 <project name="meta-fsl-arm-extra" 51 <project name="meta-fsl-arm-extra"
51 remote="freescale" 52 remote="freescale"
52 revision="b292f6204912ace18e30b7683748a311c5dfa780" 53 revision="dd074c47af53948041f6c5671e519fbf815b0980"
53 path="sources/meta-fsl-arm-extra" 54 path="sources/meta-fsl-arm-extra"
54 groups="notdefault,external,fsl,toradex,architech,smx6"/> 55 groups="notdefault,external,fsl,toradex,architech,smx6"/>
55 <project name="meta-beagleboard" 56 <project name="meta-beagleboard"
@@ -59,7 +60,7 @@
59 groups="notdefault,external,bbb"/> 60 groups="notdefault,external,bbb"/>
60 <project name="meta-toradex" 61 <project name="meta-toradex"
61 remote="toradex" 62 remote="toradex"
62 revision="eca5937408c75a997b160bd1b92e1496b07421cf" 63 revision="485643678b2d39d37b1cc9d1aa2200bb934b08de"
63 path="sources/meta-toradex" 64 path="sources/meta-toradex"
64 groups="notdefault,external,toradex"/> 65 groups="notdefault,external,toradex"/>
65 <project name="meta-tibidabo" 66 <project name="meta-tibidabo"
@@ -69,25 +70,40 @@
69 groups="notdefault,external,architech"/> 70 groups="notdefault,external,architech"/>
70 <project name="meta-intel" 71 <project name="meta-intel"
71 remote="intel" 72 remote="intel"
72 revision="29a1746ea844e1d99571cbf5533f0ff581191b16" 73 revision="4e87c59bdedaa8c3e44fc02fd23be726c4d1dfb9"
73 path="sources/meta-intel" 74 path="sources/meta-intel"
74 groups="notdefault,external,nuc"/> 75 groups="notdefault,external,intel"/>
76 <project name="meta-renesas"
77 remote="yocto"
78 revision="b7843bd6a2835e5199cab9ba196c5e67b15acaed"
79 path="sources/meta-renesas"
80 groups="notdefault,external,renesas"/>
75 81
76 <project name="meta-tegra" 82 <project name="nvidia-layer"
77 remote="playground" 83 remote="playground"
78 revision="3125d29a5c58a471b67104d1bff965df38eb3115" 84 revision="38c9b1d76037ff39b9e0cbd679b3e04b36c86ed7"
79 path="sources/meta-tegra" 85 path="sources/nvidia-layer"
80 groups="notdefault,internal"/> 86 groups="notdefault,internal"/>
81 <project name="jetson-tk1-pro" 87 <project name="jetson-tk1-pro"
82 remote="playground" 88 remote="playground"
83 revision="a376c795d5361fda4ea5f19feecc23ab7e753646" 89 revision="a376c795d5361fda4ea5f19feecc23ab7e753646"
84 path="sources/jetson-tk1-pro" 90 path="sources/jetson-tk1-pro"
85 groups="notdefault,internal"/> 91 groups="notdefault,internal"/>
92 <project name="vibrante-t186"
93 remote="playground"
94 revision="edc10bf3f4b17333021f85e9ad32f85838e2c33f"
95 path="sources/vibrante-t186"
96 groups="notdefault,internal"/>
86 <project name="meta-smx6" 97 <project name="meta-smx6"
87 remote="playground" 98 remote="playground"
88 revision="2c09deaa156df5ec8613806d6f659bc1fa89e123" 99 revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d"
89 path="sources/meta-smx6" 100 path="sources/meta-smx6"
90 groups="notdefault,internal"/> 101 groups="notdefault,internal"/>
102 <project name="renesas-rcar-gen2"
103 remote="playground"
104 revision="93b2464ca1c6200a1bdf2afcabac0c2c7e9bdf6d"
105 path="sources/renesas-rcar-gen2"
106 groups="notdefault,internal"/>
91 107
92</manifest> 108</manifest>
93 109
diff --git a/scripts/manifest_fido.xml b/scripts/manifest_jethro.xml
index 7a618e5..829ffcb 100644
--- a/scripts/manifest_fido.xml
+++ b/scripts/manifest_jethro.xml
@@ -17,29 +17,29 @@
17 17
18 <project name="poky" 18 <project name="poky"
19 remote="yocto" 19 remote="yocto"
20 revision="fido" 20 revision="jethro"
21 path="sources/poky"/> 21 path="sources/poky"/>
22 <project name="meta-openembedded" 22 <project name="meta-openembedded"
23 remote="oe-mirror" 23 remote="oe-mirror"
24 revision="fido" 24 revision="jethro"
25 path="sources/meta-openembedded"/> 25 path="sources/meta-openembedded"/>
26 <project name="meta-qt5" 26 <project name="meta-qt5"
27 remote="qtyocto" 27 remote="qtyocto"
28 revision="master-mingw" 28 revision="5.7"
29 path="sources/meta-qt5"/> 29 path="sources/meta-qt5"/>
30 <project name="meta-mingw" 30 <project name="meta-mingw"
31 remote="qtyocto" 31 remote="qtyocto"
32 path="sources/meta-mingw" 32 path="sources/meta-mingw"
33 revision="fido"/> 33 revision="jethro"/>
34 34
35 <project name="meta-fsl-arm" 35 <project name="meta-fsl-arm"
36 remote="yocto" 36 remote="yocto"
37 revision="fido" 37 revision="jethro"
38 path="sources/meta-fsl-arm" 38 path="sources/meta-fsl-arm"
39 groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/> 39 groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6,renesas"/>
40 <project name="meta-ti" 40 <project name="meta-ti"
41 remote="yocto" 41 remote="yocto"
42 revision="fido" 42 revision="master"
43 path="sources/meta-ti" 43 path="sources/meta-ti"
44 groups="notdefault,external,ti,bbb"/> 44 groups="notdefault,external,ti,bbb"/>
45 <project name="meta-raspberrypi" 45 <project name="meta-raspberrypi"
@@ -49,7 +49,7 @@
49 groups="notdefault,external,rpi"/> 49 groups="notdefault,external,rpi"/>
50 <project name="meta-fsl-arm-extra" 50 <project name="meta-fsl-arm-extra"
51 remote="freescale" 51 remote="freescale"
52 revision="fido" 52 revision="jethro"
53 path="sources/meta-fsl-arm-extra" 53 path="sources/meta-fsl-arm-extra"
54 groups="notdefault,external,fsl,toradex,architech,smx6"/> 54 groups="notdefault,external,fsl,toradex,architech,smx6"/>
55 <project name="meta-beagleboard" 55 <project name="meta-beagleboard"
@@ -69,25 +69,40 @@
69 groups="notdefault,external,architech"/> 69 groups="notdefault,external,architech"/>
70 <project name="meta-intel" 70 <project name="meta-intel"
71 remote="intel" 71 remote="intel"
72 revision="fido" 72 revision="jethro"
73 path="sources/meta-intel" 73 path="sources/meta-intel"
74 groups="notdefault,external,nuc"/> 74 groups="notdefault,external,intel"/>
75 <project name="meta-renesas"
76 remote="yocto"
77 revision="master"
78 path="sources/meta-renesas"
79 groups="notdefault,external,renesas"/>
75 80
76 <project name="meta-tegra" 81 <project name="nvidia-layer"
77 remote="playground" 82 remote="playground"
78 revision="master" 83 revision="master"
79 path="sources/meta-tegra" 84 path="sources/nvidia-layer"
80 groups="notdefault,internal"/> 85 groups="notdefault,internal"/>
81 <project name="jetson-tk1-pro" 86 <project name="jetson-tk1-pro"
82 remote="playground" 87 remote="playground"
83 revision="master" 88 revision="master"
84 path="sources/jetson-tk1-pro" 89 path="sources/jetson-tk1-pro"
85 groups="notdefault,internal"/> 90 groups="notdefault,internal"/>
91 <project name="vibrante-t186"
92 remote="playground"
93 revision="master"
94 path="sources/vibrante-t186"
95 groups="notdefault,internal"/>
86 <project name="meta-smx6" 96 <project name="meta-smx6"
87 remote="playground" 97 remote="playground"
88 revision="fido" 98 revision="fido"
89 path="sources/meta-smx6" 99 path="sources/meta-smx6"
90 groups="notdefault,internal"/> 100 groups="notdefault,internal"/>
101 <project name="renesas-rcar-gen2"
102 remote="playground"
103 revision="master"
104 path="sources/renesas-rcar-gen2"
105 groups="notdefault,internal"/>
91 106
92</manifest> 107</manifest>
93 108
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 56aadc0..5ee1ad0 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -1,24 +1,32 @@
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
23while test -n "$1"; do 31while test -n "$1"; do
24 case "$1" in 32 case "$1" in
@@ -48,10 +56,10 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}}
48 56
49if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then 57if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
50 case ${MACHINE} in 58 case ${MACHINE} in
51 apalis-imx6|colibri-imx6|colibri-vf) 59 apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
52 LAYERSCONF="bblayers.conf.toradex.sample" 60 LAYERSCONF="bblayers.conf.toradex.sample"
53 ;; 61 ;;
54 imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x) 62 imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
55 LAYERSCONF="bblayers.conf.fsl.sample" 63 LAYERSCONF="bblayers.conf.fsl.sample"
56 ;; 64 ;;
57 smarc-samx6i) 65 smarc-samx6i)
@@ -66,15 +74,21 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
66 beaglebone) 74 beaglebone)
67 LAYERSCONF="bblayers.conf.bbb.sample" 75 LAYERSCONF="bblayers.conf.bbb.sample"
68 ;; 76 ;;
69 raspberrypi|raspberrypi2) 77 raspberrypi|raspberrypi2|raspberrypi3)
70 LAYERSCONF="bblayers.conf.rpi.sample" 78 LAYERSCONF="bblayers.conf.rpi.sample"
71 ;; 79 ;;
72 nuc) 80 intel-corei7-64)
73 LAYERSCONF="bblayers.conf.nuc.sample" 81 LAYERSCONF="bblayers.conf.intel.sample"
74 ;; 82 ;;
75 nvidia-logan) 83 nvidia-logan)
76 LAYERSCONF="bblayers.conf.nvidia-logan.sample" 84 LAYERSCONF="bblayers.conf.nvidia-logan.sample"
77 ;; 85 ;;
86 tegra-x1|tegra-t18x)
87 LAYERSCONF="bblayers.conf.nvidia-tegra.sample"
88 ;;
89 alt|gose|koelsch|lager|porter|silk|stout)
90 LAYERSCONF="bblayers.conf.rcar-gen2.sample"
91 ;;
78 emulator) 92 emulator)
79 LAYERSCONF="bblayers.conf.emulator.sample" 93 LAYERSCONF="bblayers.conf.emulator.sample"
80 ;; 94 ;;
diff --git a/scripts/update-qt5-modules.sh b/scripts/update-qt5-modules.sh
index 824cb3e..d4087c3 100755
--- a/scripts/update-qt5-modules.sh
+++ b/scripts/update-qt5-modules.sh
@@ -1,24 +1,32 @@
1#!/bin/bash 1#!/bin/bash
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
23if [ $# -ne 1 ]; then 31if [ $# -ne 1 ]; then
24 echo "Usage: $0 <qt5.git>" 32 echo "Usage: $0 <qt5.git>"
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
23set -x 31set -x
24set -e 32set -e
25 33
26RELEASE=5.6 34RELEASE=5.7
27UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/ 35UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
28 36
29if [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.hdd ]; then 37if [ -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
36elif [ ${MACHINE} == "nvidia-logan" ] && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then 44elif ([ ${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
40fi 49fi
41 50
42if [ -e b2qt-${PROJECT}-qt5-image-${MACHINE}.7z ]; then 51if [ -e b2qt-${PROJECT}-qt5-image-${MACHINE}.7z ]; then
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-13 18:04:32 +0000