diff --git a/.gitlab-ci b/.gitlab-ci index 686323c648881a4fa0f3f8ae6e305d17337eecf3..2b2bc22010347ad46361e2d781a3d8ff745a1710 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 686323c648881a4fa0f3f8ae6e305d17337eecf3 +Subproject commit 2b2bc22010347ad46361e2d781a3d8ff745a1710 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1526378db84b6d3c44948343300456aa24bfeada..f02bb997ac66ca99a18dc073b31722ab8cd8ee6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,10 +4,10 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 686323c648881a4fa0f3f8ae6e305d17337eecf3 + ref: 2b2bc22010347ad46361e2d781a3d8ff745a1710 file: 'manifest.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH_MANIFEST: dunfell - GITLAB_CI_CURRENT_REV: 686323c648881a4fa0f3f8ae6e305d17337eecf3 + GITLAB_CI_CURRENT_REV: 2b2bc22010347ad46361e2d781a3d8ff745a1710 diff --git a/SRCREV.conf b/SRCREV.conf index 577ce0df784332d5bf88a9a8e759d6b4aed00f00..4ec4ecc93a2f832120a3dc03e6a62d47a4c43c5a 100644 --- a/SRCREV.conf +++ b/SRCREV.conf @@ -1,14 +1,14 @@ -SRCREV_pn-gf-productiontests = "dab14040bd60da936cd3e332274ecef3643ea782" -SRCREV_pn-gfeeprom = "afa3735b9df4202b6486a2821cb27207edfa3f7a" -SRCREV_pn-guf-show-demo = "b0ca8a0a789702fe4bd07437b4a3463d2eea0ed5" -SRCREV_pn-libmdb = "433039b1e03a59b5fb23a49c575caa808253891e" -SRCREV_pn-ltp-guf-tests = "55c83df1ac1f78a56fffe6c482261c4e6b52ef2e" -SRCREV_pn-touchcal-conv = "4c208a4068139eb0cb419ea07cf815c060c23a30" -SRCREV_pn-gfxml2dto = "83ca8a9486bd5ed5bc3f01bdd813f056214a9b6d" -SRCREV_pn-egalaxi2c = "e0420f17ebf33a23a65c0b523828b2e7b2fac618" -SRCREV_pn-gfplatdetect = "8cfdafeecbd93891575eff5956a485a87062558e" -SRCREV_pn-xconfig = "4fab67050789336cff4b744b358063f3e8936075" -SRCREV_pn-linux-guf = "8bfeaf30dac7a3c0714b8c40826b22599250fa3b" -SRCREV_pn-linux-imx-kuk = "7dd1ff2439f977f457037ed8a213a6eb071b65c9" -SRCREV_pn-u-boot-imx = "99d8b5737fef281ba8dc0c1b6dbd63a44eed60cf" -SRCREV_pn-qt-multi-screen-compositor = "4c697dcf164b0dafb34af4698bb97751776bb1ea" +SRCREV_pn-gf-productiontests = "c11a5a0e47a57f82323aa7829f542bd284f40351" +SRCREV_pn-gfeeprom = "69338a42b92c57d6523683c6444dc2671332d242" +SRCREV_pn-guf-show-demo = "8d24d006b4b88fa483f324e91239cb44810e000c" +SRCREV_pn-libmdb = "20083785465088c9a2ac040d2057abda1f199494" +SRCREV_pn-ltp-guf-tests = "5a469a1da1438c848b825fe717749b8308d5dbfe" +SRCREV_pn-touchcal-conv = "d96e70b321e69afa1871ea9e2bcd53b6768a5d7f" +SRCREV_pn-gfxml2dto = "104f5bd9ace89323de393f49182ac77360618409" +SRCREV_pn-egalaxi2c = "e5f597d9fe0caba40f0abf1851ce1587f97a1df7" +SRCREV_pn-gfplatdetect = "f6c3f120d1b13ce34e40da502befecf2adc829b3" +SRCREV_pn-xconfig = "d506ab2c022897f8d60359e7b32ca821529b42ef" +SRCREV_pn-linux-guf = "b23ac12f91038ba216b443149f0994fe4bc877cb" +SRCREV_pn-linux-imx-kuk = "26c615141a1ec651264e6f07444116e4eb9721d7" +SRCREV_pn-u-boot-imx = "cc9006dc87c4254e1c057866e61a9eb268365942" +SRCREV_pn-qt-multi-screen-compositor = "02aabdd26925c2bc28ce0ef76e1d556790e4b234" diff --git a/default.xml b/default.xml index 6199a019b2e33f9d89a6a7d8c9d043baa21254c4..2c5b2f0a2f42c2bc3a4a08af9f32d14b6e07b020 100644 --- a/default.xml +++ b/default.xml @@ -20,10 +20,10 @@ <project name="meta-qt5.git" revision="10f3673fd4b6c6e1e61c23478802f83652475a5f" remote="qt5-github" path="sources/meta-qt5" /> <project name="meta-freescale.git" revision="5a026be5a6b29a27a7754d7fa5d4765c99f98ed9" remote="fslc" path="sources/meta-freescale" /> <project name="meta-freescale-distro.git" revision="5d882cdf079b3bde0bd9869ce3ca3db411acbf3b" remote="fslc" path="sources/meta-freescale-distro" /> - <project name="layers/meta-seconorth-machine" revision="c5e47375d1d862fdd9107a30028a10fc9afbfcc6" remote="seco-ne" path="sources/meta-seconorth-machine" /> - <project name="layers/meta-seconorth-distro" revision="4df8cfb573e4dbf78bf807bdc66822fc66dd93be" remote="seco-ne" path="sources/meta-seconorth-distro" /> - <project name="layers/meta-seconorth-nogplv3" revision="407636cbca0b937757f8341c2d2520b11c31b9a9" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> - <project name="config" revision="2116569bb99bb65ce97275cae2ac175a0e3af497" remote="seco-ne" path=".conf" > + <project name="layers/meta-seconorth-machine" revision="b33bba31f1196b8d583d2913264564a6d38248c3" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-distro" revision="5878fec14f91c39f862b2b1c25b710751e7bd364" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="fbacbc2e16e31f281a03901c91085d83f7b72863" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="bcc19b3a3b25e59cd59c5b6571a2451f9ec37daa" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project>