diff --git a/.gitlab-ci b/.gitlab-ci index 9982711f4f5600b7031c8ee7bddefafdb1497516..d5d8ebd10c4197fec45eba85150b54d56e7015bd 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 9982711f4f5600b7031c8ee7bddefafdb1497516 +Subproject commit d5d8ebd10c4197fec45eba85150b54d56e7015bd diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a986ee950e1dda65c8270a69e2efbcada32030df..af4625a35f6f939a8de6166118eb3c658fb840d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,13 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 9982711f4f5600b7031c8ee7bddefafdb1497516 + ref: d5d8ebd10c4197fec45eba85150b54d56e7015bd file: 'manifest-pipeline-yocto.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH: kirkstone - GITLAB_CI_REVISION: 9982711f4f5600b7031c8ee7bddefafdb1497516 + GITLAB_CI_REVISION: d5d8ebd10c4197fec45eba85150b54d56e7015bd generate-build-jobs: variables: diff --git a/SRCREV.conf b/SRCREV.conf index b052a0f921372c1feed6a549cea0c4166c3a3a4e..da4436f04fbf7bd6c78dba8404be196e76be2fa6 100644 --- a/SRCREV.conf +++ b/SRCREV.conf @@ -1,15 +1,15 @@ -SRCREV:pn-egalaxi2c = "cc69f5f385a0e7afb2ed839f94f4b27ac691e0c3" -SRCREV:pn-emc-test-suite = "2bb508f3db7c2697eaaf5b66aadadbd5f0bdc40d" -SRCREV:pn-gf-productiontests = "5a7973651645c951ef2d119922de79ed288f27dd" -SRCREV:pn-gfeeprom = "e113c726e31cb7fed36312427bec15038c5fa2d4" -SRCREV:pn-gfplatdetect = "970ebf48ef4e8cb49f7b17710c3c2aceb208092f" -SRCREV:pn-gfxml2dto = "ded1ccba11e7fd101751aa4530d7b182b64360e5" -SRCREV:pn-seco-show-demo = "9fc4fba4aeb2fc622b8f23eaac60b23a94a2c39c" -SRCREV:pn-libmdb = "f6c8e7925451867f3a286377d4e600e032ea0a49" -SRCREV:pn-linux-seconorth = "2d9b2214dbaa0d58c1f4b6a113acf1b18e98e2ea" -SRCREV:pn-linux-imx = "544db85bb180aa902ae60dc9430b4747d32e488f" +SRCREV:pn-egalaxi2c = "79c51fd5a16a6f33e7e3faf1e69b8879e7bea530" +SRCREV:pn-emc-test-suite = "10705a3312465a72fd622e53eaae92699c15caca" +SRCREV:pn-gf-productiontests = "5e37445fd83a369f3df7643cf0023be2ac35d3ef" +SRCREV:pn-gfeeprom = "74790ba07faca5555377d0fe48f1570b372843c5" +SRCREV:pn-gfplatdetect = "f16244cf49fe2f16bc65d6c8ef55542ead4d54c5" +SRCREV:pn-gfxml2dto = "df3f3fa7858ef93b11ef3955f808cd2a0cccb7ad" +SRCREV:pn-seco-show-demo = "667fe694a3f529405d0bb0ecf91fdb6a42e52801" +SRCREV:pn-libmdb = "9c392f8e7ec443731b63c437347ed2a3e4fb12c5" +SRCREV:pn-linux-seconorth = "41875782489885a475a5d3026a9a5533ebc3d8a0" +SRCREV:pn-linux-imx = "e03dd7e8e44a8e35bff2308c139d59af37cbdc61" SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a" -SRCREV:pn-touchcal-conv = "9ab8c81d0946656668d75d215c460182e7200762" -SRCREV:pn-u-boot-imx = "eeaddfdf65afd27fabf3a05b6fbe788422b475ab" -SRCREV:pn-xconfig = "eb0b455e23737d0602837cd03a7bf3344afb7b6d" -SRCREV:pn-qt-multi-screen-compositor = "c23f9b8684c52800d7c6b4bed4c3aff02c42c3b3" +SRCREV:pn-touchcal-conv = "b5030ac4f1220e6990120f061e8b5ece883a5223" +SRCREV:pn-u-boot-imx = "7ae2cbcae4c2572740476b142cfc69a0aa213f09" +SRCREV:pn-xconfig = "8a87da1ba119e375cef5c439a6672343afee67ec" +SRCREV:pn-qt-multi-screen-compositor = "6208118c122f64bb1d39b7f7624b465028a38284" diff --git a/default.xml b/default.xml index a539c2338274e73b4619e7fa0c5a69164cbbf708..3ae603329de71020ead721daf497be43e6b4d224 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="3aa0c0eb54cb2953d3317f9770761e10c70c6388" remote="seco-ne" path="sources/meta-seconorth-machine" /> - <project name="layers/meta-seconorth-distro" revision="1c52dfec53df5a86d29c0914712c64febbd67935" remote="seco-ne" path="sources/meta-seconorth-distro" /> - <project name="layers/meta-seconorth-nogplv3" revision="ff922229f9b4da813f96ce2cbd24b41252e9a12f" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> - <project name="config" revision="e93c5615678b18e49fc193c8cf4fb3a5ce38ba75" remote="seco-ne" path=".conf" > + <project name="layers/meta-seconorth-machine" revision="e09e0c91640ed933583d5bc95c57f268de540f4a" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-distro" revision="046c22e600b1570329c8825f53900859cf9a5efb" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="c33706ca1eef71e3cc692a87674a89e2ad19fdca" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="84f8dec962a6886d839b7889aa2159429750d48f" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project>