From 3fc7fbeb76fb97ceae6763e6dccebbaa9c14c5f4 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 7 Apr 2016 08:42:48 +0300 Subject: Do not pull internal repos when initializing for all devices When initializing build environment with '--device all', some internal repos are fetch that are not available for customers. Now those repos are fetched only when initializing with '--device internal' Change-Id: I12981449d4ca9c2d3529ed81649b3cc0a1bfed02 Task-number: QTBUG-52002 Reviewed-by: Tuomas Heimonen Reviewed-by: Teemu Holappa --- scripts/manifest.xml | 23 +++++++++++------------ scripts/manifest_fido.xml | 24 ++++++++++++------------ 2 files changed, 23 insertions(+), 24 deletions(-) (limited to 'scripts') diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 5ba0e81..b91ac37 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -27,7 +27,6 @@ remote="qtyocto" revision="e29477ac42b47f4fedd2cb4be27ec2e4aa70540c" path="sources/meta-qt5"/> - + groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/> + groups="notdefault,external,ti,bbb"/> + groups="notdefault,external,rpi"/> + groups="notdefault,external,fsl,toradex,architech,smx6"/> + groups="notdefault,external,bbb"/> + groups="notdefault,external,toradex"/> + groups="notdefault,external,architech"/> + groups="notdefault,external,nuc"/> + groups="notdefault,internal,nvidia-logan"/> + groups="notdefault,internal,nvidia-logan"/> + groups="notdefault,internal,smx6"/> diff --git a/scripts/manifest_fido.xml b/scripts/manifest_fido.xml index 3a13f40..cd4b2c4 100644 --- a/scripts/manifest_fido.xml +++ b/scripts/manifest_fido.xml @@ -27,7 +27,6 @@ remote="qtyocto" revision="master-mingw" path="sources/meta-qt5"/> - + groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/> + groups="notdefault,external,ti,bbb"/> + groups="notdefault,external,rpi"/> + groups="notdefault,external,fsl,toradex,architech,smx6"/> + groups="notdefault,external,bbb"/> + groups="notdefault,external,toradex"/> + groups="notdefault,external,architech"/> + groups="notdefault,external,nuc"/> + groups="notdefault,internal,nvidia-logan"/> + groups="notdefault,internal,nvidia-logan"/> + groups="notdefault,internal,smx6"/> + -- cgit v1.2.3-54-g00ecf From 04d4e351cde51a61e9ceaeb0265c1d4b8677b6ca Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 29 Mar 2016 12:40:14 -0700 Subject: setup-environment: prevent basename argument being parsed as option. This fixes an issue where this script fails with the default Dash shell on Ubuntu (where "$0" is "-bash" and it is parsed as an option). Change-Id: I6fec2a7b4e8eee68b5f11101783d7dff7d07f712 Reviewed-by: Donald Carr Reviewed-by: Risto Avila Reviewed-by: Samuli Piippo --- scripts/setup-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 28adeec..566b708 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -34,7 +34,7 @@ while test -n "$1"; do done THIS_SCRIPT="setup-environment.sh" -if [ "$(basename $0)" = "${THIS_SCRIPT}" ]; then +if [ "$(basename -- $0)" = "${THIS_SCRIPT}" ]; then echo "Error: This script needs to be sourced. Please run as '. $0'" exit 1 fi -- cgit v1.2.3-54-g00ecf From d153b85f7c96a1a6a033fc2764efab877e7f9e9d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 11 Apr 2016 08:36:33 +0300 Subject: Update revisions for poky and openembedded Pull in latest security fixes Change-Id: I5e95c0b1cc14d537ce228b4e475208916d0b1b63 Reviewed-by: Teemu Holappa --- scripts/manifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/manifest.xml b/scripts/manifest.xml index b91ac37..4008fda 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -17,11 +17,11 @@ Date: Mon, 11 Apr 2016 08:39:22 +0300 Subject: qt5: update submodules Needs latest version of meta-qt5 Change-Id: If2002e4dbc8159d144fdd32bdbaf7ea1a4625889 Reviewed-by: David Schulz --- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- recipes-qt/qt5/qt3d_git.bbappend | 2 +- recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtcanvas3d_git.bbappend | 2 +- recipes-qt/qt5/qtconnectivity_git.bbappend | 2 +- recipes-qt/qt5/qtdeclarative_git.bbappend | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bbappend | 2 +- recipes-qt/qt5/qtimageformats_git.bbappend | 2 +- recipes-qt/qt5/qtlocation_git.bbappend | 2 +- recipes-qt/qt5/qtmultimedia_git.bbappend | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bbappend | 2 +- recipes-qt/qt5/qtsensors_git.bbappend | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bbappend | 2 +- recipes-qt/qt5/qtsvg_git.bbappend | 2 +- recipes-qt/qt5/qtsystems_git.bbappend | 8 +------- recipes-qt/qt5/qttools_git.bbappend | 2 +- recipes-qt/qt5/qttranslations_git.bbappend | 2 +- recipes-qt/qt5/qtwayland-native_git.bbappend | 2 +- recipes-qt/qt5/qtwayland_git.bbappend | 2 +- recipes-qt/qt5/qtwebchannel_git.bbappend | 2 +- recipes-qt/qt5/qtwebengine_git.bbappend | 4 ++-- recipes-qt/qt5/qtwebsockets_git.bbappend | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bbappend | 2 +- scripts/manifest.xml | 2 +- 27 files changed, 28 insertions(+), 34 deletions(-) (limited to 'scripts') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index a63c8b0..5b25f39 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" +SRCREV = "8ce657d0279566ef327af1b88339534041ddc012" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index 7cec73a..318bb1b 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend @@ -25,4 +25,4 @@ SRC_URI_append_class-target = " \ file://0001-Remove-qgltf.patch \ " -SRCREV = "7a208d76ed96bb506899becfe680df06f95451c7" +SRCREV = "9c67288ea4791fee5e28d1b4f2981c232b95c9d0" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 76c3986..fcbbcf0 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" +SRCREV = "8ce657d0279566ef327af1b88339534041ddc012" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index eaab0a6..bb778a0 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -45,7 +45,7 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" +SRCREV = "8ce657d0279566ef327af1b88339534041ddc012" # Temporarily here, until merged upstream PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend index 0a8d678..c2ee6e1 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bbappend +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18" +SRCREV = "791ddce7d41b126ba4744a6701597f49dbf99f3b" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 6841ebe..9c4a689 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -21,4 +21,4 @@ PACKAGECONFIG += "bluez4" -SRCREV = "8b550f0a7508ed413cded71a20485e61010b0aa3" +SRCREV = "80b6557be3a23a5118ddf8c4b68bc28b66f52b49" diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 804c736..f7d8ed7 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "dc558b69f083c89aa8c02952e5f167405939a61a" +SRCREV = "d438b4f4b93d04a841edf031359e26af617d889d" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend index d5da008..6e1888f 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "4b8e9a348ca379b203c26ff14dd236267dd60646" +SRCREV = "6523d7c4843e1d4176035c46e1514c39bdcfc3bf" diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend index 4213bc9..87a191b 100644 --- a/recipes-qt/qt5/qtimageformats_git.bbappend +++ b/recipes-qt/qt5/qtimageformats_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "0bd46d5861fa7b48c87cd3a734d00671df929869" +SRCREV = "bf5b49878d75d316f31225f76152e8381a3d5f0f" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index 3b3bae1..a175291 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -24,4 +24,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "ca4bce553d03a64fa119650990083267ea9c8d31" +SRCREV = "f40e92b147560be15e0f53dfd7f6b2d698c00fb9" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index ca77e8c..24f176d 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -21,4 +21,4 @@ PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}" -SRCREV = "9985224a89b830dc182b428f491b6187d6f0e1ba" +SRCREV = "3fb3231a9e22dcb780d5b31ec57896429d40b0e5" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 2e0fa7b..a80b21f 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -31,7 +31,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtgraphicaleffects" -SRCREV = "7fc567eda8a187e365f4c29c6e8f08440bf31218" +SRCREV = "bed6b3d633d83302a8e2167845db4b36e6847f0b" FILES_${PN}-qmldesigner += " \ ${OE_QMAKE_PATH_QML}/*/*/*/designer \ diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index 7d64fdc..29fb136 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79b" +SRCREV = "b1d29faf96ee6323bf2dad054291fd7c30a30c05" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index c9c89ed..f5301b4 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -22,4 +22,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "7197e7f4b385315cb241043495cbfad58deb911a" +SRCREV = "0b00ee6f6c311a7f5c0b4f2441dad97a454d172e" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 1605b7b..484d6ee 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -31,4 +31,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "48f32572590e45a57573944c0822855819d138df" +SRCREV = "04b75569f36eec14662505a08bf8c1d565cb10fe" diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index e0b0c7e..a625d74 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "03d492e49e74eefa1c83e37e833d862f4b9f1e45" +SRCREV = "9a70ee2389d3302f6a4262325f8a76e4d867b478" diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend index 56a80d9..beb7513 100644 --- a/recipes-qt/qt5/qtsvg_git.bbappend +++ b/recipes-qt/qt5/qtsvg_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "38777ea7451d55e9c3d32d88d46063016013f60c" +SRCREV = "b722836765dccca04683939d0d4f72a9e2585d88" diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend index 3d02409..c8c7671 100644 --- a/recipes-qt/qt5/qtsystems_git.bbappend +++ b/recipes-qt/qt5/qtsystems_git.bbappend @@ -22,10 +22,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "37b614abbfb35d06a57e5b0824249c3abd5640e3" - -LIC_FILES_CHKSUM = " \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ -" +SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a" diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index 4200c4d..31d5773 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "9904992dc4eb9a5958fcfbac238374ff38498143" +SRCREV = "aec1d10c66a676781c767099e81871faa040162f" diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index 5045c67..cfe42a8 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde" +SRCREV = "cbef985e3c3e9af2d124d40959fc674b3b8aa33f" diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index 9e48cab..66656e6 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "29b8bd8b1117589341110502fe516bf22c920747" +SRCREV = "b94be41409a6dfa58d8b3ae8413c6930e76fc040" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index 9e48cab..66656e6 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "29b8bd8b1117589341110502fe516bf22c920747" +SRCREV = "b94be41409a6dfa58d8b3ae8413c6930e76fc040" diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend index ac958c0..49ccceb 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bbappend +++ b/recipes-qt/qt5/qtwebchannel_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "92d903d92b430222cd3f89eab08d61d947e5abea" +SRCREV = "64a106da72796377bbff5cce0ecc5a379b105498" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index 0f684cc..319a9ad 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -25,5 +25,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "5c4ae298b0a3d75c4c5ea8aef0595914ab25607f" -SRCREV_chromium = "e63eb5276c8d141853e2c26bf1bac469ed60465f" +SRCREV_qtwebengine = "4ed08bb0a8195746c333dabbdb9da3400d174296" +SRCREV_chromium = "0a385bb01d9cf060fae4c9d350ee98561654df96" diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend index 528e5b6..91881b4 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bbappend +++ b/recipes-qt/qt5/qtwebsockets_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "88946bbe209cb6148b4a3284077bb9a06c7bc1ef" +SRCREV = "3b128f9b45f4fafc305ff0c89cfc2cb665c856d5" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend index 287ed42..28d0211 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend +++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "de2dadb8af67f9d425c3a8d2353a7d5b07588915" +SRCREV = "7a8d395a3b1eb5f24aa96509666326bad4218c14" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 4008fda..d3be1f8 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -25,7 +25,7 @@ path="sources/meta-openembedded"/> Date: Mon, 11 Apr 2016 12:59:21 +0300 Subject: Use --internal arg to fetch playground repos Add separate --internal argument to get all internal repos from playground, regardless what --device is used. Change-Id: If0411f877d1c7c21fcc7a4ac7f03adec3dabd5f6 Reviewed-by: Teemu Holappa Reviewed-by: Louai Al-Khanji --- b2qt-init-build-env | 14 ++++++++++---- scripts/manifest.xml | 6 +++--- scripts/manifest_fido.xml | 6 +++--- 3 files changed, 16 insertions(+), 10 deletions(-) (limited to 'scripts') diff --git a/b2qt-init-build-env b/b2qt-init-build-env index ddfabf6..cd5952f 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -26,7 +26,10 @@ usage() { echo "Usage: $(basename $0) COMMAND [ARGS]" echo echo "Initialize build environment:" - echo " $(basename $0) init --device [--reference ]" + echo " $(basename $0) init --device [--reference ] [--internal]" + echo " --device : target device name or 'all'" + echo " --reference : path to local mirror, initialized previously with '$(basename $0) mirror'" + echo " --internal: fetch internal repositories, available only inside The Qt Company network." echo "Initialize local mirror:" echo " $(basename $0) mirror" echo "List available devices:" @@ -51,6 +54,9 @@ while test -n "$1"; do shift REPO_URL="--repo-url $1" ;; + "--internal") + INTERNAL="y" + ;; *) if [ -n "$COMMAND" ]; then echo "Unknown argument: $1" @@ -92,9 +98,6 @@ get_groups() { all) PROJECT_GROUPS="external" ;; - internal) - PROJECT_GROUPS="external internal" - ;; apalis-imx6|colibri-imx6|colibri-vf) PROJECT_GROUPS="toradex" ;; @@ -132,6 +135,9 @@ get_groups() { esac PROJECT_GROUPS="${PROJECT_GROUPS} default" + if [ "${INTERNAL}" = "y" ]; then + PROJECT_GROUPS="${PROJECT_GROUPS} internal" + fi } list_devices() { diff --git a/scripts/manifest.xml b/scripts/manifest.xml index d3be1f8..5e326c9 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -77,17 +77,17 @@ remote="playground" revision="3125d29a5c58a471b67104d1bff965df38eb3115" path="sources/meta-tegra" - groups="notdefault,internal,nvidia-logan"/> + groups="notdefault,internal"/> + groups="notdefault,internal"/> + groups="notdefault,internal"/> diff --git a/scripts/manifest_fido.xml b/scripts/manifest_fido.xml index cd4b2c4..be15f02 100644 --- a/scripts/manifest_fido.xml +++ b/scripts/manifest_fido.xml @@ -77,17 +77,17 @@ remote="playground" revision="master" path="sources/meta-tegra" - groups="notdefault,internal,nvidia-logan"/> + groups="notdefault,internal"/> + groups="notdefault,internal"/> + groups="notdefault,internal"/> -- cgit v1.2.3-54-g00ecf