diff --git a/.gitlab-ci b/.gitlab-ci index 9982711f4f5600b7031c8ee7bddefafdb1497516..38c04aefccf3bfe607c28177750135a044d6c6c7 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 9982711f4f5600b7031c8ee7bddefafdb1497516 +Subproject commit 38c04aefccf3bfe607c28177750135a044d6c6c7 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a986ee950e1dda65c8270a69e2efbcada32030df..5cffd74edd8072e285718da3f11c8e4fadaa67f5 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: 38c04aefccf3bfe607c28177750135a044d6c6c7 file: 'manifest-pipeline-yocto.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH: kirkstone - GITLAB_CI_REVISION: 9982711f4f5600b7031c8ee7bddefafdb1497516 + GITLAB_CI_REVISION: 38c04aefccf3bfe607c28177750135a044d6c6c7 generate-build-jobs: variables: diff --git a/SRCREV.conf b/SRCREV.conf index b052a0f921372c1feed6a549cea0c4166c3a3a4e..1bdba00366556e1288ccafa12c1ec75a43a6266a 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 = "3b5f2be4d72b01ab45030a64bfcee2c44646d242" +SRCREV:pn-emc-test-suite = "27efc08261e986f7eb54cf3dc2128462d67f347b" +SRCREV:pn-gf-productiontests = "65b7015aca4955c2cd4521847eb21641431c1e20" +SRCREV:pn-gfeeprom = "2b9b90f65f14ce04b2efeee8fc528258d0081f11" +SRCREV:pn-gfplatdetect = "a29222653bd8bfae07750a2e390e42de24994e2a" +SRCREV:pn-gfxml2dto = "594f37f5a4aa3c75f356cc2980ff2fca54cea0bb" +SRCREV:pn-seco-show-demo = "1c419ef90c1eedaadf15175e6a81980652fe2c5f" +SRCREV:pn-libmdb = "535e2b7fe0e93ffc298ba1ca95f830da16f80bfd" +SRCREV:pn-linux-seconorth = "c9960445abffcaa928788c86f20944e1eba92cc7" +SRCREV:pn-linux-imx = "82cacedb784226107de212f1706d351311c8b175" 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 = "b2cc65910b5187cc754639c01968bfd57dd415f4" +SRCREV:pn-u-boot-imx = "a9a506c5ab3a34f1cb802f7038cd2cf135c951ad" +SRCREV:pn-xconfig = "701dad85eee86e3e1164963c67b70f703401fb84" +SRCREV:pn-qt-multi-screen-compositor = "d227da3371967fa34248e9148819693274412ef2" diff --git a/default.xml b/default.xml index a539c2338274e73b4619e7fa0c5a69164cbbf708..f68b360e3a2ca37e9f282b1250f10e371994f5be 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="7337a11afc085d2ed12b8f4ca838e49076262dad" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-distro" revision="74ec3ab1538d6db7e027bcd65a079a475b84ac91" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="49c29c0958a64c8450a0e9aae9a1b1f3eecbdac1" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="7510c8272c5aff5ae35cbd4714a94a8cd6bec2d2" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project>