diff --git a/.gitlab-ci b/.gitlab-ci index 9982711f4f5600b7031c8ee7bddefafdb1497516..c16962f891b40c2829e3359bceb13c3a5602e1d3 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 9982711f4f5600b7031c8ee7bddefafdb1497516 +Subproject commit c16962f891b40c2829e3359bceb13c3a5602e1d3 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a986ee950e1dda65c8270a69e2efbcada32030df..82c433fef81e594c06a071153449faf3d0779e9d 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: c16962f891b40c2829e3359bceb13c3a5602e1d3 file: 'manifest-pipeline-yocto.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH: kirkstone - GITLAB_CI_REVISION: 9982711f4f5600b7031c8ee7bddefafdb1497516 + GITLAB_CI_REVISION: c16962f891b40c2829e3359bceb13c3a5602e1d3 generate-build-jobs: variables: diff --git a/SRCREV.conf b/SRCREV.conf index c206dfed1ecad36193024dfba70e115711872dd0..d60496dcb4e89d24ce1f08ff75ac407f5c61ca32 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 = "3762b0bae5f003e46ca83a8e4ed8996ff755c0c8" +SRCREV:pn-emc-test-suite = "023bcd9cb0b6b27c4b31d38c17cee561f791c046" +SRCREV:pn-gf-productiontests = "8e4f644dc81d9de70e9d866f69fa3c12232a4eb0" +SRCREV:pn-gfeeprom = "b05a56673e8981bf2571655657583eaba589e270" +SRCREV:pn-gfplatdetect = "cc55ba241ad57d1327baeb8f8285ee9cde9cc30a" +SRCREV:pn-gfxml2dto = "54c45baedc7238a1a6c87cac79ac5793404006a6" +SRCREV:pn-seco-show-demo = "d3520404130b2167e033431d0d6d6314cb48d47d" +SRCREV:pn-libmdb = "eff221b73c07d2aeb337e78395243726e82ae0f2" +SRCREV:pn-linux-seconorth = "3ac1a4c2a14674933db7b2b9deb862095c448c29" +SRCREV:pn-linux-imx = "bda8f8714e112b9ee7d175bff45c23d4d655b271" 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 = "afb135950555e9437c24e659407b4f0d7e6d57fe" +SRCREV:pn-touchcal-conv = "527e24ba03c3817f581a7767b4ac0a3e00b5edf8" +SRCREV:pn-u-boot-imx = "2c7478977a9f52b9f7e06d5395aab1baa59b2464" +SRCREV:pn-xconfig = "60173ce2a4a117808acfa906685154ce8e8eb61b" +SRCREV:pn-qt-multi-screen-compositor = "9733a30948cb85105cb0fb94f358db29bd786686" diff --git a/default.xml b/default.xml index 4f30d43205cbb08d0b75edba91c35b85d1cde968..64d3f3af8224d861ddf347fdf24779fabea622e8 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="85526c52058b7dcc339b6426c269f89cbceee244" 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="ba6b0ac962c5e48ecb0802641db2f3c129b36abb" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-distro" revision="b7d9fba56e0dc40afbc87e3e0d0649c9832f16f0" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="47cd13e27f82a006293720a203965b2596bec0db" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="752c2d8a1f4d1cdf9698f86e4b541655a58637db" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project>