diff options
| -rwxr-xr-x | meta-boot2qt/files/configure-qtcreator.sh | 14 | ||||
| -rw-r--r-- | scripts/manifest.xml | 12 |
2 files changed, 12 insertions, 14 deletions
diff --git a/meta-boot2qt/files/configure-qtcreator.sh b/meta-boot2qt/files/configure-qtcreator.sh index 7a899fa0..04b5cc68 100755 --- a/meta-boot2qt/files/configure-qtcreator.sh +++ b/meta-boot2qt/files/configure-qtcreator.sh @@ -35,7 +35,7 @@ CONFIG="" printUsage () { - echo "Usage: $0 --config <environment-setup-file> [--remove] [--qtcreator <path>] [--name <basename>]" + echo "Usage: $0 --config <environment-setup-file> [--remove] --sdktool <path>] [--name <basename>]" } while test -n "$1"; do @@ -43,9 +43,9 @@ while test -n "$1"; do "--remove") REMOVEONLY=1 ;; - "--qtcreator") + "--sdktool") shift - QTCREATOR=$1 + SDKTOOL=$1 ;; "--config") shift @@ -68,13 +68,11 @@ if [ ! -f "$CONFIG" ]; then exit 1 fi -if [ -z "${QTCREATOR}" ]; then - SDKTOOL="${HOME}/Qt/Tools/QtCreator/libexec/qtcreator/sdktool" -else - SDKTOOL="${QTCREATOR}/libexec/qtcreator/sdktool" +if [ -z "${SDKTOOL}" ]; then + SDKTOOL="${HOME}/Qt/Tools/sdktool/libexec/qtcreator/sdktool" fi if [ ! -x ${SDKTOOL} ]; then - echo "Cannot find 'sdktool' from QtCreator" + echo "Cannot find 'sdktool'" printUsage exit 1 fi diff --git a/scripts/manifest.xml b/scripts/manifest.xml index ada3a379..2d450b01 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -5,12 +5,12 @@ fetch="git://git.yoctoproject.org"/> <project name="poky" remote="yocto" - revision="refs/tags/yocto-3.1.32" + revision="refs/tags/yocto-3.1.33" upstream="dunfell" path="sources/poky"/> <project name="meta-mingw" remote="yocto" - revision="refs/tags/yocto-3.1.32" + revision="refs/tags/yocto-3.1.33" upstream="dunfell" path="sources/meta-mingw"/> @@ -19,7 +19,7 @@ fetch="git://git.openembedded.org"/> <project name="meta-openembedded" remote="oe" - revision="c74ebbddfd9dbe02d3f7422016324451eb218e1e" + revision="01358b6d705071cc0ac5aefa7670ab235709729a" upstream="dunfell" path="sources/meta-openembedded"/> <project name="meta-python2" @@ -66,7 +66,7 @@ fetch="git://git.yoctoproject.org"/> <project name="meta-intel" remote="intel" - revision="e482213f37828216c7a7df68ff353652cc865ec1" + revision="bab936cb4ae5671ceaccf50305a6c0515e6f0222" upstream="dunfell" path="sources/meta-intel"/> @@ -75,7 +75,7 @@ fetch="https://github.com/OE4T"/> <project name="meta-tegra" remote="OE4T" - revision="08bb040a2280000b8cde7628b981f112e945dff5" + revision="a78fac5cc646c022bdb074c40ddbac80aee6e42f" upstream="dunfell" path="sources/meta-tegra"/> <!-- internal layer for the nvidia devnet downloads --> @@ -97,7 +97,7 @@ path="sources/meta-toradex-bsp-common"/> <project name="meta-toradex-nxp" remote="toradex" - revision="d7075d95ca68661d0e95f5324a19e0397d6b1a45" + revision="5763fe5bfa7645cd8f148f0ef0dcf83c43d38475" upstream="dunfell-5.x.y" path="sources/meta-toradex-nxp"/> |