diff --git a/.gitlab-ci b/.gitlab-ci index 9982711f4f5600b7031c8ee7bddefafdb1497516..d404f25753e07da8a97145706ecf7aaf5fd52f0a 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 9982711f4f5600b7031c8ee7bddefafdb1497516 +Subproject commit d404f25753e07da8a97145706ecf7aaf5fd52f0a diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a986ee950e1dda65c8270a69e2efbcada32030df..a93a4a5e63b1eb72111a542a441fcb55fa3abf06 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: d404f25753e07da8a97145706ecf7aaf5fd52f0a file: 'manifest-pipeline-yocto.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH: kirkstone - GITLAB_CI_REVISION: 9982711f4f5600b7031c8ee7bddefafdb1497516 + GITLAB_CI_REVISION: d404f25753e07da8a97145706ecf7aaf5fd52f0a generate-build-jobs: variables: diff --git a/SRCREV.conf b/SRCREV.conf index f06fb4585607a9b483dc407b1ba3192a183fe429..16f5ae68ad7920633025bfd727e9371659f5733a 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 = "d7b1d07c528a53c1e39beb9f3f7aecea7deec1b9" +SRCREV:pn-egalaxi2c = "c5cb072a8d609e128282eb682eda19a5118386cb" +SRCREV:pn-emc-test-suite = "ce3bad6394b5948baa540803d90e14e692637139" +SRCREV:pn-gf-productiontests = "36c7789b0530965e74eb0c5c9b0ed425bae07b31" +SRCREV:pn-gfeeprom = "8a4c957daec0889d2c4c3c85f518c238a5b3d49b" +SRCREV:pn-gfplatdetect = "39cce1b2b9680368d18ca3b369166719d4a55168" +SRCREV:pn-gfxml2dto = "551d856f6ae55ae061088a391b5122f049a1631c" +SRCREV:pn-seco-show-demo = "7eff513cc09230d404f8bf313bf80330823f4cbb" +SRCREV:pn-libmdb = "932b3293bfdd58e11b98d65215759821da64ecb5" +SRCREV:pn-linux-seconorth = "535c502526c821fc52e0a7da919d1b152b25b7bc" +SRCREV:pn-linux-imx = "aafaeaae0aa9ad127972615be293bcdbee51f755" SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a" -SRCREV:pn-touchcal-conv = "9ab8c81d0946656668d75d215c460182e7200762" -SRCREV:pn-u-boot-imx = "55a2c30c3b23bbc88ab00e409a995094324d204a" -SRCREV:pn-xconfig = "eb0b455e23737d0602837cd03a7bf3344afb7b6d" -SRCREV:pn-qt-multi-screen-compositor = "c23f9b8684c52800d7c6b4bed4c3aff02c42c3b3" +SRCREV:pn-touchcal-conv = "98e4151bc842fbc2f63fa83b21ab138b2fe5f455" +SRCREV:pn-u-boot-imx = "d337e623ac70b86cc09056b49c6619ccf59cd675" +SRCREV:pn-xconfig = "b71882fe1e4a3c5c71a4743c8151a343d40d55fb" +SRCREV:pn-qt-multi-screen-compositor = "607e1124f9b2c9945f41ceacf5273b398b109df2" diff --git a/default.xml b/default.xml index 08bd64c51dfaccd581a012f1136285e8ac6d0e4d..dd0fd15e98fd7f124cba66ce726cc2aeeb94bfff 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="698597b7ea8ffe2c6b55ba5df7fb994092b60c03" 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="ee62ae6fcdafed53b7b95fa785ed0296395dc2f3" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-distro" revision="0f6e1bf40196364732224f6abbfe4004c5e86dfc" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="0b94d35d2683609c1eae147e40add9702308c85d" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="7df2ecda8ef72f1912db1ed9d1df78e8a8a2aa4f" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project>