diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-18 10:14:32 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-18 10:15:24 +0300 |
commit | abd29cce5e3cc3b0d0d2cf023bb9d327ef96f548 (patch) | |
tree | f58615ff2ceb23fe22d15901e977772d865ebf80 /b2qt-init-build-env | |
parent | 64d0d088725b7ad70080068c3eb9f5dccec9bd32 (diff) | |
parent | 293bb2b4195281d7b4a56f16c77bdf16831334e4 (diff) | |
download | meta-boot2qt-abd29cce5e3cc3b0d0d2cf023bb9d327ef96f548.tar.gz |
Merge remote-tracking branch 'origin/fido' into dev
* origin/fido:
Move usage of internal mirrors into a bbclass
Use --internal arg to fetch playground repos
qtquickcompiler: update revision to work with Qt 5.6.1
qt5: update submodules
gcc: patch already applied on oe layer
Update revisions for poky and openembedded
Fix meta-environment to work without changes in local.conf
Disabled SSTATE_MIRRORS and PRE_MIRRORS.
setup-environment: prevent basename argument being parsed as option.
Do not pull internal repos when initializing for all devices
Conflicts:
conf/local.conf.sample
recipes-qt/qt5/nativesdk-qtbase_git.bbappend
recipes-qt/qt5/qt3d_git.bbappend
recipes-qt/qt5/qtbase-native_git.bbappend
recipes-qt/qt5/qtbase_git.bbappend
recipes-qt/qt5/qtcanvas3d_git.bbappend
recipes-qt/qt5/qtconnectivity_git.bbappend
recipes-qt/qt5/qtdeclarative_git.bbappend
recipes-qt/qt5/qtgraphicaleffects_git.bbappend
recipes-qt/qt5/qtimageformats_git.bbappend
recipes-qt/qt5/qtlocation_git.bbappend
recipes-qt/qt5/qtmultimedia_git.bbappend
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bbappend
recipes-qt/qt5/qtsensors_git.bbappend
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bbappend
recipes-qt/qt5/qtsvg_git.bbappend
recipes-qt/qt5/qttools_git.bbappend
recipes-qt/qt5/qttranslations_git.bbappend
recipes-qt/qt5/qtwayland-native_git.bbappend
recipes-qt/qt5/qtwayland_git.bbappend
recipes-qt/qt5/qtwebchannel_git.bbappend
recipes-qt/qt5/qtwebengine_git.bbappend
recipes-qt/qt5/qtwebsockets_git.bbappend
recipes-qt/qt5/qtxmlpatterns_git.bbappend
scripts/manifest.xml
scripts/manifest_jethro.xml
Change-Id: I17c4dd6890dc4475171133cede4dc7e6217222d6
Diffstat (limited to 'b2qt-init-build-env')
-rwxr-xr-x | b2qt-init-build-env | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 8541c72..b395e5d 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env | |||
@@ -26,7 +26,10 @@ usage() { | |||
26 | echo "Usage: $(basename $0) COMMAND [ARGS]" | 26 | echo "Usage: $(basename $0) COMMAND [ARGS]" |
27 | echo | 27 | echo |
28 | echo "Initialize build environment:" | 28 | echo "Initialize build environment:" |
29 | echo " $(basename $0) init --device <name> [--reference <mirror path>]" | 29 | echo " $(basename $0) init --device <name> [--reference <mirror path>] [--internal]" |
30 | echo " --device <name>: target device name or 'all'" | ||
31 | echo " --reference <mirror path>: path to local mirror, initialized previously with '$(basename $0) mirror'" | ||
32 | echo " --internal: fetch internal repositories, available only inside The Qt Company network." | ||
30 | echo "Initialize local mirror:" | 33 | echo "Initialize local mirror:" |
31 | echo " $(basename $0) mirror" | 34 | echo " $(basename $0) mirror" |
32 | echo "List available devices:" | 35 | echo "List available devices:" |
@@ -51,6 +54,9 @@ while test -n "$1"; do | |||
51 | shift | 54 | shift |
52 | REPO_URL="--repo-url $1" | 55 | REPO_URL="--repo-url $1" |
53 | ;; | 56 | ;; |
57 | "--internal") | ||
58 | INTERNAL="y" | ||
59 | ;; | ||
54 | *) | 60 | *) |
55 | if [ -n "$COMMAND" ]; then | 61 | if [ -n "$COMMAND" ]; then |
56 | echo "Unknown argument: $1" | 62 | echo "Unknown argument: $1" |
@@ -90,7 +96,7 @@ get_repo() { | |||
90 | get_groups() { | 96 | get_groups() { |
91 | case ${DEVICE} in | 97 | case ${DEVICE} in |
92 | all) | 98 | all) |
93 | PROJECT_GROUPS="all" | 99 | PROJECT_GROUPS="external" |
94 | ;; | 100 | ;; |
95 | apalis-imx6|colibri-imx6|colibri-vf) | 101 | apalis-imx6|colibri-imx6|colibri-vf) |
96 | PROJECT_GROUPS="toradex" | 102 | PROJECT_GROUPS="toradex" |
@@ -127,11 +133,14 @@ get_groups() { | |||
127 | ;; | 133 | ;; |
128 | *) | 134 | *) |
129 | echo "Unknown device configuration, including all meta layers" | 135 | echo "Unknown device configuration, including all meta layers" |
130 | PROJECT_GROUPS="all" | 136 | PROJECT_GROUPS="external" |
131 | ;; | 137 | ;; |
132 | esac | 138 | esac |
133 | 139 | ||
134 | PROJECT_GROUPS="${PROJECT_GROUPS} default" | 140 | PROJECT_GROUPS="${PROJECT_GROUPS} default" |
141 | if [ "${INTERNAL}" = "y" ]; then | ||
142 | PROJECT_GROUPS="${PROJECT_GROUPS} internal" | ||
143 | fi | ||
135 | } | 144 | } |
136 | 145 | ||
137 | list_devices() { | 146 | list_devices() { |