diff --git a/.gitlab-ci b/.gitlab-ci index bab6f8116ca81f562eef7d878bec5992953c4276..ea1f3badfbab2167640774e38310c9251ada488b 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit bab6f8116ca81f562eef7d878bec5992953c4276 +Subproject commit ea1f3badfbab2167640774e38310c9251ada488b diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e3280a5cd3aba6365e8655965c176d6191b4b3a..ede96eb63ef900e7b32f98b8d2c8fe13402c11de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,13 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: bab6f8116ca81f562eef7d878bec5992953c4276 + ref: ea1f3badfbab2167640774e38310c9251ada488b file: 'manifest-pipeline-yocto.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH: kirkstone - GITLAB_CI_REVISION: bab6f8116ca81f562eef7d878bec5992953c4276 + GITLAB_CI_REVISION: ea1f3badfbab2167640774e38310c9251ada488b generate-build-jobs: variables: diff --git a/SRCREV.conf b/SRCREV.conf index e2d5a14be7cdfc5b3643caaedab9645539d74e4b..8d5979a2d9f7c49ba31ac971ef13a9add102df81 100644 --- a/SRCREV.conf +++ b/SRCREV.conf @@ -1,15 +1,15 @@ -SRCREV:pn-egalaxi2c = "1bddc7f1e51ba5e51a3d6b7b3a4c3d9db511a1cf" -SRCREV:pn-emc-test-suite = "dd35a67f9bdea5e3ca4005026b06962b1b37c19d" -SRCREV:pn-gf-productiontests = "d76bbbf79ffc6da2422f0ba196beaf37470cc6ff" -SRCREV:pn-gfeeprom = "2e81608dd924e9fabbf825f5984407ecf5ba6528" -SRCREV:pn-gfplatdetect = "95dad5ca696321d6c7648038ea27811628465d16" -SRCREV:pn-gfxml2dto = "6b370a2799279383879541dcbcdb725adbe57782" -SRCREV:pn-seco-show-demo = "63c2c35c44d1e52ba2dbfd719651984f817deef5" -SRCREV:pn-libmdb = "6da9982af621915f0a7b5d98acbfd39bfef66d4d" -SRCREV:pn-linux-seconorth = "670728b91081f8771335ec78118a8442b93efacf" -SRCREV:pn-linux-imx = "52d6049aeda48800fa3d06dff6555ff7652057e1" +SRCREV:pn-egalaxi2c = "dc4260a9f3b9e239e33128b8c980bbe2d1e53168" +SRCREV:pn-emc-test-suite = "0c347f5cb783a2f34773ede2b36f7d218edf6f55" +SRCREV:pn-gf-productiontests = "6201a96c914711818bd47e39d1fb9fbbfc3dac15" +SRCREV:pn-gfeeprom = "088daca079266b1aa0a1b233448e7f708a6454a4" +SRCREV:pn-gfplatdetect = "e6c772505e0aac0d4160756441beaf13a4b5b196" +SRCREV:pn-gfxml2dto = "a34fa74b284b027ad8607b90f0dcd309103e6211" +SRCREV:pn-seco-show-demo = "126bfeba70e76dc2f850cbeff599ca174674ae7e" +SRCREV:pn-libmdb = "2b877654a4ba8b5eab37be4def6f4f5afb928cba" +SRCREV:pn-linux-seconorth = "e6977fffe8c12010605a99d744839532b1bb49ac" +SRCREV:pn-linux-imx = "88989e072d937dc20b1cb652ace0032f01830377" SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a" -SRCREV:pn-touchcal-conv = "37eba770cb6dbc7f0acbf1ca1f458dc59201f07b" -SRCREV:pn-u-boot-imx = "fbdefa230419a1bfa30445c2001514164d77207c" -SRCREV:pn-xconfig = "c38d535a112e6d44c60142a02efa0f9d387d14e2" -SRCREV:pn-qt-multi-screen-compositor = "abbf695c3ef8c6c42cb396d0f9deaa3651b8cb8f" +SRCREV:pn-touchcal-conv = "f25d3c1e62dd032935baa61d8314fefd96fb0e84" +SRCREV:pn-u-boot-imx = "41c1301fb334417e2fe795bb532bbb15c9c1fef3" +SRCREV:pn-xconfig = "8bd3cbee5833b727514abdde13d6242517f7e6a8" +SRCREV:pn-qt-multi-screen-compositor = "231a5a01502f5e5dc2c9846b3f41418b3bd2a72f" diff --git a/default.xml b/default.xml index 85ce187614b2e0fa7a30b941e9e8c3820dffa2f9..068d1c794898d50677bea08cfff77474ecec7d5f 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="1b79581967c9fe9a834fbabd8e51eccaa610e2ad" remote="seco-ne" path="sources/meta-seconorth-machine" /> - <project name="layers/meta-seconorth-distro" revision="8feb426db0b93e4792b00c7fc7ae9affada752a1" remote="seco-ne" path="sources/meta-seconorth-distro" /> - <project name="layers/meta-seconorth-nogplv3" revision="7b216c89e409cdae56df978816beb4bb29b0ce19" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> - <project name="config" revision="e86a82d3eda3c8d50cafc1c080a15e8d3e8ff82c" remote="seco-ne" path=".conf" > + <project name="layers/meta-seconorth-machine" revision="11c61f6430542b0516a6446d0585526fc1eed86c" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-distro" revision="2f578a3d6c80664b85dfd900b481fc057184c2e1" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="bc8e74df2938229f56dea0937246b20c5c3557eb" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="9fa6ffba2b2dcca848fb6b635d1d3cdda40da3aa" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project>