diff --git a/.gitlab-ci b/.gitlab-ci index 9982711f4f5600b7031c8ee7bddefafdb1497516..d47a0e9417e72a4d9458202a3b4a8d7b8f5b84da 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 9982711f4f5600b7031c8ee7bddefafdb1497516 +Subproject commit d47a0e9417e72a4d9458202a3b4a8d7b8f5b84da diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a986ee950e1dda65c8270a69e2efbcada32030df..f28096b3e886e6f1efa8488008203ea3f9612f83 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: d47a0e9417e72a4d9458202a3b4a8d7b8f5b84da file: 'manifest-pipeline-yocto.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH: kirkstone - GITLAB_CI_REVISION: 9982711f4f5600b7031c8ee7bddefafdb1497516 + GITLAB_CI_REVISION: d47a0e9417e72a4d9458202a3b4a8d7b8f5b84da generate-build-jobs: variables: diff --git a/SRCREV.conf b/SRCREV.conf index e19d5b3aee60bdc5785afb64c13e2e379b732089..bdfc446432d914a59b8952c5e80528569a819358 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 = "c725534dc02a00c5b5d1997c39a083b4515fc817" -SRCREV:pn-linux-imx = "25869b458637409593a68ae7b29d304e7767344e" +SRCREV:pn-egalaxi2c = "5cde1cd4742c4eb3051516c4f710af2ee05f69b9" +SRCREV:pn-emc-test-suite = "7907187110dea6ab053dade1665a7fd4616069ad" +SRCREV:pn-gf-productiontests = "f4cced3c6db9b5da0fc3b772ddfdf3c16323e7da" +SRCREV:pn-gfeeprom = "d5fc8fe9475c6dff311354ab60d8bd186d3414ac" +SRCREV:pn-gfplatdetect = "0c237fd82245760b1017e9133fff44dea2e32514" +SRCREV:pn-gfxml2dto = "fc488a6355ab3bf21a96d6c1d224877b7f83f5e6" +SRCREV:pn-seco-show-demo = "beaa920d898342fe5a260bae9afd2b95cd66dd5c" +SRCREV:pn-libmdb = "68c38f4b864c0c06836a565aed2d566aa3aa37da" +SRCREV:pn-linux-seconorth = "4335946d0b6c8902bc0253b950152a6f66090a60" +SRCREV:pn-linux-imx = "caed48c25c161e108aac7b1efbc03b52bfdb48e5" SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a" -SRCREV:pn-touchcal-conv = "9ab8c81d0946656668d75d215c460182e7200762" -SRCREV:pn-u-boot-imx = "a817e56b75d9acc2b9fec77a7cbe1c500309c1c3" -SRCREV:pn-xconfig = "eb0b455e23737d0602837cd03a7bf3344afb7b6d" -SRCREV:pn-qt-multi-screen-compositor = "c23f9b8684c52800d7c6b4bed4c3aff02c42c3b3" +SRCREV:pn-touchcal-conv = "f568d3b19d251027e73573dc14a8337481225afc" +SRCREV:pn-u-boot-imx = "70698895e5d81710b8e10d0652edef50c6e2fc5a" +SRCREV:pn-xconfig = "77fd2613a3699cf06c5c4779f4e5a04426fcfec1" +SRCREV:pn-qt-multi-screen-compositor = "b1f0e519bacdbf1896c63ca4249f125be615a13c" diff --git a/default.xml b/default.xml index 9abbb45b828a859926e13854f24aed139924a749..a8eb45e3981e8e752261f6573508e20a7e468caa 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="7a9f61afd6453d3ed631c5eafb96e4b3dc89db28" remote="seco-ne" path="sources/meta-seconorth-machine" /> - <project name="layers/meta-seconorth-distro" revision="406f23b789ade51f9bea9f26b0288d922d12d320" 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="5f14786a2f264923853dcb9b6b49a88593c73792" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-distro" revision="88d1bb2cbfe71d2099ec7c318a49f4e8371c4543" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="4b334937a5fe8cd6499b12bdd2e8e8d5638d23a6" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="4c36504c24b767fec64180bcf0aedbbb03d5d4b1" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project>