summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/configure-qtcreator.sh2
-rw-r--r--scripts/manifest.xml35
-rwxr-xr-xscripts/setup-environment.sh7
3 files changed, 26 insertions, 18 deletions
diff --git a/scripts/configure-qtcreator.sh b/scripts/configure-qtcreator.sh
index d6e9c07..7386f70 100755
--- a/scripts/configure-qtcreator.sh
+++ b/scripts/configure-qtcreator.sh
@@ -85,7 +85,7 @@ fi
85source $CONFIG 85source $CONFIG
86 86
87MKSPEC="devices/linux-oe-generic-g++" 87MKSPEC="devices/linux-oe-generic-g++"
88MKSPECPATH=$(find ${OECORE_TARGET_SYSROOT} -name $(basename ${MKSPEC})) 88MKSPECPATH=$(find ${OECORE_TARGET_SYSROOT} -name $(basename ${MKSPEC}) 2>/dev/null || true)
89if [ ! -d "${MKSPECPATH}" ]; then 89if [ ! -d "${MKSPECPATH}" ]; then
90 echo "Error: could not find mkspec ${MKSPEC} from the toolchain" 90 echo "Error: could not find mkspec ${MKSPEC} from the toolchain"
91 exit 1 91 exit 1
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 21d611c..1aa053b 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -13,52 +13,53 @@
13 <remote fetch="git://github.com/renesas-rcar" name="renesas"/> 13 <remote fetch="git://github.com/renesas-rcar" name="renesas"/>
14 <remote fetch="git://git.linaro.org/openembedded" name="linaro"/> 14 <remote fetch="git://git.linaro.org/openembedded" name="linaro"/>
15 <remote fetch="git://git.toradex.com" name="toradex"/> 15 <remote fetch="git://git.toradex.com" name="toradex"/>
16 <remote fetch="git://github.com/boundarydevices" name="boundary"/>
16 17
17 <project name="poky" 18 <project name="poky"
18 remote="yocto" 19 remote="yocto"
19 revision="e3ff03599e55fd2abcaa33e29779c388cdbed94e" 20 revision="b9ad197bbc88cad4ef8d2245a2d262b8d8dd757e"
20 path="sources/poky"/> 21 path="sources/poky"/>
21 <project name="meta-openembedded" 22 <project name="meta-openembedded"
22 remote="oe-mirror" 23 remote="oe-mirror"
23 revision="b40116cf457b88a2db14b86fda9627fb34d56ae6" 24 revision="b2ce52334cf88e07f703cf25ced92302edd5b0e9"
24 path="sources/meta-openembedded"/> 25 path="sources/meta-openembedded"/>
25 <project name="meta-qt5" 26 <project name="meta-qt5"
26 remote="qtyocto" 27 remote="qtyocto"
27 revision="e721e84659869e4a04838d95d7cdbab9d48f5c3d" 28 revision="a358108b09762390ec951f560540bb99aaf9f2a2"
28 path="sources/meta-qt5"/> 29 path="sources/meta-qt5"/>
29 <project name="meta-mingw" 30 <project name="meta-mingw"
30 remote="qtyocto" 31 remote="qtyocto"
31 path="sources/meta-mingw" 32 revision="27ccecd47b5e745d4c6a11708dd42a90cc235fb3"
32 revision="4a621def8529c3a55c6fcaef72e3b1832a9327b3"/> 33 path="sources/meta-mingw"/>
33 34
34 <project name="meta-freescale" 35 <project name="meta-freescale"
35 remote="freescale" 36 remote="freescale"
36 revision="05681fdf8298bb441c15135eae424c7601b07e98" 37 revision="06178400afbd641a6709473fd21d893dcd3cfbfa"
37 path="sources/meta-freescale" 38 path="sources/meta-freescale"
38 groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3"/> 39 groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3,boundary"/>
39 <project name="meta-freescale-3rdparty" 40 <project name="meta-freescale-3rdparty"
40 remote="freescale" 41 remote="freescale"
41 revision="1879485e63ce369292c89b5902ff6df13509090b" 42 revision="9613dbc02ca970122a01c935bc9e5789ced73a9d"
42 path="sources/meta-freescale-3rdparty" 43 path="sources/meta-freescale-3rdparty"
43 groups="notdefault,external,fsl,toradex,smx6"/> 44 groups="notdefault,external,fsl,toradex,smx6,boundary"/>
44 <project name="meta-ti" 45 <project name="meta-ti"
45 remote="yocto" 46 remote="yocto"
46 revision="0862a33b8d642e5fad031a78f90410d497453415" 47 revision="aca8f5d6ff8a529e00bdeae5b401c791ed6ecb2b"
47 path="sources/meta-ti" 48 path="sources/meta-ti"
48 groups="notdefault,external,ti"/> 49 groups="notdefault,external,ti"/>
49 <project name="meta-raspberrypi" 50 <project name="meta-raspberrypi"
50 remote="yocto" 51 remote="yocto"
51 revision="380bf2ff445c2049bdea15f3bb36e8cb36540345" 52 revision="8ba2d6fc80b31c87d25c87c863e2a77752b07c3c"
52 path="sources/meta-raspberrypi" 53 path="sources/meta-raspberrypi"
53 groups="notdefault,external,rpi"/> 54 groups="notdefault,external,rpi"/>
54 <project name="meta-intel" 55 <project name="meta-intel"
55 remote="intel" 56 remote="intel"
56 revision="6add41510412ca196efb3e4f949d403a8b6f35d7" 57 revision="7e8f98aa326f16edd679a95f7bb2daf4256479f3"
57 path="sources/meta-intel" 58 path="sources/meta-intel"
58 groups="notdefault,external,intel"/> 59 groups="notdefault,external,intel"/>
59 <project name="meta-tegra" 60 <project name="meta-tegra"
60 remote="madisongh" 61 remote="madisongh"
61 revision="fba09b70a8ac36248e5fcea611e3bb661bb089fc" 62 revision="34ddb90840f9bb895cd5d275922d153e35620fa3"
62 path="sources/meta-tegra" 63 path="sources/meta-tegra"
63 groups="notdefault,external,jetson"/> 64 groups="notdefault,external,jetson"/>
64 <project name="meta-renesas" 65 <project name="meta-renesas"
@@ -68,7 +69,7 @@
68 groups="notdefault,external,renesas-gen3"/> 69 groups="notdefault,external,renesas-gen3"/>
69 <project name="meta-linaro" 70 <project name="meta-linaro"
70 remote="linaro" 71 remote="linaro"
71 revision="c44bd0ebc8ca2e6201996ef7cba8b71421d3aff7" 72 revision="74dacb34c13d1c85fe4627a890b9c04940f9ffeb"
72 path="sources/meta-linaro" 73 path="sources/meta-linaro"
73 groups="notdefault,external,renesas-gen3"/> 74 groups="notdefault,external,renesas-gen3"/>
74 <project name="meta-toradex-bsp-common" 75 <project name="meta-toradex-bsp-common"
@@ -81,6 +82,11 @@
81 revision="45c33b79a734d016dddb997c1895b53202286f23" 82 revision="45c33b79a734d016dddb997c1895b53202286f23"
82 path="sources/meta-toradex-nxp" 83 path="sources/meta-toradex-nxp"
83 groups="notdefault,external,toradex"/> 84 groups="notdefault,external,toradex"/>
85 <project name="meta-boundary"
86 remote="boundary"
87 revision="42b00061076b2a6e15c1eeed7da6fc14a0dae9d8"
88 path="sources/meta-boundary"
89 groups="notdefault,external,boundary"/>
84 90
85 <project name="nvidia-layer" 91 <project name="nvidia-layer"
86 remote="playground" 92 remote="playground"
@@ -103,4 +109,3 @@
103 path="sources/meta-smx6" 109 path="sources/meta-smx6"
104 groups="notdefault,internal"/> 110 groups="notdefault,internal"/>
105</manifest> 111</manifest>
106
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index fbe8672..c0d952f 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -59,7 +59,10 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
59 apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7) 59 apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
60 LAYERSCONF="bblayers.conf.toradex.sample" 60 LAYERSCONF="bblayers.conf.toradex.sample"
61 ;; 61 ;;
62 imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd|imx7s-warp) 62 nitrogen6x|nitrogen7)
63 LAYERSCONF="bblayers.conf.boundary.sample"
64 ;;
65 imx6qsabresd|imx6dlsabresd|imx7dsabresd|imx7s-warp)
63 LAYERSCONF="bblayers.conf.fsl.sample" 66 LAYERSCONF="bblayers.conf.fsl.sample"
64 ;; 67 ;;
65 smarc-samx6i) 68 smarc-samx6i)
@@ -83,7 +86,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
83 emulator) 86 emulator)
84 LAYERSCONF="bblayers.conf.emulator.sample" 87 LAYERSCONF="bblayers.conf.emulator.sample"
85 ;; 88 ;;
86 jetson-tx1|jetson-tk1) 89 jetson-tx1|jetson-tx2|jetson-tk1)
87 LAYERSCONF="bblayers.conf.jetson.sample" 90 LAYERSCONF="bblayers.conf.jetson.sample"
88 ;; 91 ;;
89 *) 92 *)