diff --git a/.gitlab-ci b/.gitlab-ci index 37b396e85024b6c07a1a843f10a3e9d72f981945..f0ed0f4fd8cea2d0c76aabc102c68bf89fe96fbc 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 37b396e85024b6c07a1a843f10a3e9d72f981945 +Subproject commit f0ed0f4fd8cea2d0c76aabc102c68bf89fe96fbc diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7968d2b6bd22b700bd54cc1364d88523d72d6b1..8bff41e9ba78673b6461aec57d5bfd4abb74921a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,13 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 37b396e85024b6c07a1a843f10a3e9d72f981945 + ref: f0ed0f4fd8cea2d0c76aabc102c68bf89fe96fbc file: 'manifest-pipeline-yocto.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH: kirkstone - GITLAB_CI_REVISION: 37b396e85024b6c07a1a843f10a3e9d72f981945 + GITLAB_CI_REVISION: f0ed0f4fd8cea2d0c76aabc102c68bf89fe96fbc # FIXME: For now we need a two-step variable assignment here due to a GitLab bug: # https://gitlab.com/gitlab-org/gitlab/-/issues/273409 # Escaped variables are not correctly passed to child pipelines. Proposed workaround diff --git a/SRCREV.conf b/SRCREV.conf index f86106fbc54c0722a33bd9199ef8f13f29823788..ccecb2235cc852735b6ad8e14d6af316bdb6ee14 100644 --- a/SRCREV.conf +++ b/SRCREV.conf @@ -1,25 +1,25 @@ -SRCREV:pn-atmel-mxt = "1e75476108451d791db5e8d29833f2a2a8a8b853" -SRCREV:pn-egalaxi2c = "4f4c02529d025f7c2c50613faa42e03a50b09e68" -SRCREV:pn-emc-test-suite = "f40be4f18deeb20c36ae5e79030f8492173230b7" -SRCREV:pn-gf-productiontests = "a7f36c79328451d50718cdc7604faff11899af82" -SRCREV:pn-gfeeprom = "cd6a5ade96e68865aca97c9f7fa808c32d46edd1" -SRCREV:pn-gfplatdetect = "4340185a0f6d70a66c4bb2b9b4657a907d9b245f" -SRCREV:pn-gfxml2dto = "907933715d64d2c54738bb89f865e5b4e1c47e40" -SRCREV:pn-ilitek = "a52a7e5265a20a3d08e9e5ba9b1fc38a923d69ec" -SRCREV:pn-kernel-module-touchgpio = "75010597e4b8950f9b1d2c54db277551b3eb8a75" -SRCREV:pn-libmdb = "bdbb2dce6229dd606f83bc20da2a5a85ee2cdc60" -SRCREV:pn-linux-imx = "956dea2b5f8dcc47b317eb8bf4a2e1a2ce44c72b" +SRCREV:pn-atmel-mxt = "afb3f6820b01f3327bdf0c4e0117e92b2d3d4328" +SRCREV:pn-egalaxi2c = "da3a5465b7d680668258c21e324a7d3e88b50bf9" +SRCREV:pn-emc-test-suite = "6208ca9277e838b04e965a928e0ee76129e74994" +SRCREV:pn-gf-productiontests = "73c54fba37598a7e59e57cac75f8f62f40a57c2b" +SRCREV:pn-gfeeprom = "5fc8430d0d9735cf0d567c1ced1be3279b812aaf" +SRCREV:pn-gfplatdetect = "0dfdf1f48fbc77f983e1e477edafd073606a88fd" +SRCREV:pn-gfxml2dto = "acc915e1dde00badf19f5995c5d3efca430b5524" +SRCREV:pn-ilitek = "e344d1028c382d052e52fd6c32d8858a2c0719ef" +SRCREV:pn-kernel-module-touchgpio = "0a283900d2d275a26ffb02e7752ea4ec56d95426" +SRCREV:pn-libmdb = "a1e26c8c4baa8b8c71ca4ce32d77539bea998272" +SRCREV:pn-linux-imx = "59a4d70959dfb4a51aecba161b52a1e7099b7880" SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a" -SRCREV:pn-linux-seconorth = "de944f1931269819bbf48d6ce7fc507eef2e9ff3" -SRCREV:pn-linux-seco-mtk = "09de24cdabdfa286ec9d76ef34c85c4304f47da7" -SRCREV:pn-qt-multi-screen-compositor = "34eebfe7d53c594b03fa97061ed8497f430000cd" -SRCREV:pn-seco-sharedconf = "65527d35a1a6da47fd34112b612485ecedd1704d" -SRCREV:pn-seco-show-demo = "7c77c8497d922b9ca741df5e4eb8ac75a8d40c92" -SRCREV:pn-seco-yocto-testsuite = "8224e01573f38d9d71fd59dbbe3630783a3aab1b" -SRCREV:pn-secure-element-examples = "4a1345d72318a860b1e1b25f7d2aeae31bd82ed7" -SRCREV:pn-touchcal-conv = "f94b16ad499ec927382ce4df5cb5aa47bd262a29" -SRCREV:pn-u-boot-seco-imx = "9873f78bed8defc4f928c588009335c7cdf940e0" -SRCREV:pn-u-boot-seco-mtk = "f2c4123023c08c4d57af4c779b84a3a630a34ed3" -SRCREV:pn-xconfig = "b73393aaa08932a3ec293b392eebb9f51bcbf9c7" -SRCREV:pn-yocto-install = "d442d8845ac630e0be4968b52234f602c7ffc668" -SRCREV:pn-seco-stm32 = "88709b1270f297850e80637099c48f7eb3c7896b" +SRCREV:pn-linux-seconorth = "d8bc0e602660580aac417833ef0fa8a4613fc48a" +SRCREV:pn-linux-seco-mtk = "eecf057c78c3822ae247caf724c1f08a3cafb3a3" +SRCREV:pn-qt-multi-screen-compositor = "69870a1320e0b66f24302997c479ac7a76863d36" +SRCREV:pn-seco-sharedconf = "889134e63fca783531ed8a5034b71548c580c1e0" +SRCREV:pn-seco-show-demo = "e8145e429ffc230cf3f2e35b613a65fe5c60161b" +SRCREV:pn-seco-yocto-testsuite = "1f5adda262b32c1e93f8de481cd3a5005bb93278" +SRCREV:pn-secure-element-examples = "6ffa1f26659fd1b3634e9bbaa11f8830418d8d4b" +SRCREV:pn-touchcal-conv = "b32a8439dfd3cf7a8c24d7e873ac0cb74137479d" +SRCREV:pn-u-boot-seco-imx = "431f437112c69192fa67799166c03f8d8e8c70ae" +SRCREV:pn-u-boot-seco-mtk = "89f8125e306d69010a85ffd76e948e8bbea76601" +SRCREV:pn-xconfig = "9322109a455b41aa40f3f65b86486d8462d0afe1" +SRCREV:pn-yocto-install = "cd1df3b6569cb82c6b1b886401992371222cd5ff" +SRCREV:pn-seco-stm32 = "a028dda704aa0f5ae9cf54778eb227e11196d425" diff --git a/default.xml b/default.xml index cb535dce0ae8a2cfe73a63dcc6a988d4d46614c7..650ba52b4f170b77eab99d822d00bff8a4be7df7 100644 --- a/default.xml +++ b/default.xml @@ -28,11 +28,11 @@ <project name="meta-mediatek-bsp.git" revision="048e2981c96b0e93896d540c53b789f8c93c7e6e" remote="rity" path="sources/meta-mediatek-bsp" /> <project name="meta-rity.git" revision="bc2393cf3c26a3db6da719a5e05d517c6fe01e6c" remote="rity" path="sources/meta-rity" /> <project name="meta-rauc.git" revision="804386f04826ea7fe74a1b4e0a20991425c06d9c" remote="rauc" path="sources/meta-rauc" /> - <project name="layers/meta-seconorth-machine" revision="86c2b53098df680d0b91b5bcd57f538a1fcbbdf3" remote="seco-ne" path="sources/meta-seconorth-machine" /> - <project name="layers/meta-seconorth-mtk" revision="9cbf55169ba11d3f417b6b7af8c010b27bb74c6e" remote="seco-ne" path="sources/meta-seconorth-mtk" /> - <project name="layers/meta-seconorth-distro" revision="09c5bb5e941c3badae0547fde3aa9dcd2bfabe65" remote="seco-ne" path="sources/meta-seconorth-distro" /> - <project name="layers/meta-seconorth-nogplv3" revision="5a5d807bda99b87a9c8594e52a290a417f4f432c" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> - <project name="config" revision="67567679f7c30009acaee2fdba1d228b0cb11994" remote="seco-ne" path=".conf" > + <project name="layers/meta-seconorth-machine" revision="5974e2e77f9101c3af909d3126cd9ad9dff2349c" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-mtk" revision="24457be931575a0e9267c595ecee1733f83c6e4a" remote="seco-ne" path="sources/meta-seconorth-mtk" /> + <project name="layers/meta-seconorth-distro" revision="a3f79c8a2f86147971c289736cb24091ff26841b" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="5e64f5e1f45067d26d523be84cba0c68c28e6d27" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="d4da2a811e9708f0570c8cf9935fb4bbfd49b707" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project>