diff --git a/.gitlab-ci b/.gitlab-ci index 28906544c622720ab6b2141c0664567a57333b28..bab6f8116ca81f562eef7d878bec5992953c4276 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 28906544c622720ab6b2141c0664567a57333b28 +Subproject commit bab6f8116ca81f562eef7d878bec5992953c4276 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fbca7316a1d4d3b834c14c7c4b5ba467c44a4ec8..8e3280a5cd3aba6365e8655965c176d6191b4b3a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,13 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 28906544c622720ab6b2141c0664567a57333b28 + ref: bab6f8116ca81f562eef7d878bec5992953c4276 file: 'manifest-pipeline-yocto.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH: kirkstone - GITLAB_CI_REVISION: 28906544c622720ab6b2141c0664567a57333b28 + GITLAB_CI_REVISION: bab6f8116ca81f562eef7d878bec5992953c4276 generate-build-jobs: variables: diff --git a/SRCREV.conf b/SRCREV.conf index 637f50c0516409c45598f191de55d4aefaa35a0a..e2d5a14be7cdfc5b3643caaedab9645539d74e4b 100644 --- a/SRCREV.conf +++ b/SRCREV.conf @@ -1,15 +1,15 @@ -SRCREV:pn-egalaxi2c = "f683cd1b469b39535a8eee9da33302024d355aec" -SRCREV:pn-emc-test-suite = "c0a8d4f5b311ebb60bc3c9a5fbbc738226189fe2" -SRCREV:pn-gf-productiontests = "277458f5691533eb93be7d834a945eef5bfd2f97" -SRCREV:pn-gfeeprom = "93ce043d32bf33238c863e893a137cbba9e93f67" -SRCREV:pn-gfplatdetect = "a748725d71e1fe86e3f06f82c1d2442dc3144340" -SRCREV:pn-gfxml2dto = "19c4001459fa5c33acb8e211aeb10320d1734fba" -SRCREV:pn-seco-show-demo = "308eed9eaa5fc173f352a482c0dc2442c838fa5f" -SRCREV:pn-libmdb = "5ff9fca315a0c9950ccb4fecaf23d0b881803d82" -SRCREV:pn-linux-seconorth = "76d37cdf8d510ada26d9b639266ad872d7f48511" -SRCREV:pn-linux-imx = "56c1ed8e89829b815a73d4acbaddf1f764f44be5" +SRCREV:pn-egalaxi2c = "1bddc7f1e51ba5e51a3d6b7b3a4c3d9db511a1cf" +SRCREV:pn-emc-test-suite = "dd35a67f9bdea5e3ca4005026b06962b1b37c19d" +SRCREV:pn-gf-productiontests = "d76bbbf79ffc6da2422f0ba196beaf37470cc6ff" +SRCREV:pn-gfeeprom = "2e81608dd924e9fabbf825f5984407ecf5ba6528" +SRCREV:pn-gfplatdetect = "95dad5ca696321d6c7648038ea27811628465d16" +SRCREV:pn-gfxml2dto = "6b370a2799279383879541dcbcdb725adbe57782" +SRCREV:pn-seco-show-demo = "63c2c35c44d1e52ba2dbfd719651984f817deef5" +SRCREV:pn-libmdb = "6da9982af621915f0a7b5d98acbfd39bfef66d4d" +SRCREV:pn-linux-seconorth = "670728b91081f8771335ec78118a8442b93efacf" +SRCREV:pn-linux-imx = "52d6049aeda48800fa3d06dff6555ff7652057e1" SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a" -SRCREV:pn-touchcal-conv = "5525a806d870fc033b5eeef5c9173f41b441af60" -SRCREV:pn-u-boot-imx = "91ca439728db4a148771cb82d5ada49e0dcef834" -SRCREV:pn-xconfig = "5cef2c96c6a7b65f5799316a59f18040d3681375" -SRCREV:pn-qt-multi-screen-compositor = "50e3a4ac7eea8c8ede886434219a1818de610152" +SRCREV:pn-touchcal-conv = "37eba770cb6dbc7f0acbf1ca1f458dc59201f07b" +SRCREV:pn-u-boot-imx = "fbdefa230419a1bfa30445c2001514164d77207c" +SRCREV:pn-xconfig = "c38d535a112e6d44c60142a02efa0f9d387d14e2" +SRCREV:pn-qt-multi-screen-compositor = "abbf695c3ef8c6c42cb396d0f9deaa3651b8cb8f" diff --git a/default.xml b/default.xml index d88cf20ab6d956645133d8c645fc8174a7936b79..85ce187614b2e0fa7a30b941e9e8c3820dffa2f9 100644 --- a/default.xml +++ b/default.xml @@ -21,10 +21,10 @@ <project name="meta-qt5.git" revision="5b71df60e523423b9df6793de9387f87a149ac42" remote="qt5-github" path="sources/meta-qt5" /> <project name="meta-freescale.git" revision="dd98526300937450d741c9b3403799632f417226" remote="fslc" path="sources/meta-freescale" /> <project name="meta-freescale-distro.git" revision="fc15f5003043da23212596be7366ae2547c308ad" remote="fslc" path="sources/meta-freescale-distro" /> - <project name="layers/meta-seconorth-machine" revision="671be3c59285421db92bff40f49e4a963c4e0000" remote="seco-ne" path="sources/meta-seconorth-machine" /> - <project name="layers/meta-seconorth-distro" revision="e9793252833947d286ded7d14ee2ad4fae9e34cd" remote="seco-ne" path="sources/meta-seconorth-distro" /> - <project name="layers/meta-seconorth-nogplv3" revision="50d4d7f7f1b9e785365285a2f9664d6014b52e6b" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> - <project name="config" revision="292bad03002c903e8cab8e471d67122c0bf14517" remote="seco-ne" path=".conf" > + <project name="layers/meta-seconorth-machine" revision="1b79581967c9fe9a834fbabd8e51eccaa610e2ad" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-distro" revision="8feb426db0b93e4792b00c7fc7ae9affada752a1" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="7b216c89e409cdae56df978816beb4bb29b0ce19" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="e86a82d3eda3c8d50cafc1c080a15e8d3e8ff82c" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project>