diff --git a/.gitlab-ci b/.gitlab-ci index 91dc115a3aa08fdf5d48e0f88ef44661f85c90c2..8a38f19499ac4da8b34d66c04fd47fef771f3aa9 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 91dc115a3aa08fdf5d48e0f88ef44661f85c90c2 +Subproject commit 8a38f19499ac4da8b34d66c04fd47fef771f3aa9 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e904849a62c41f6f249763bccf5f21c404effde6..d44494b8157ceb9aa4f6b111446bf862b636219c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,13 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 91dc115a3aa08fdf5d48e0f88ef44661f85c90c2 + ref: 8a38f19499ac4da8b34d66c04fd47fef771f3aa9 file: 'manifest-pipeline-yocto.yml' variables: MANIFEST_PROJECT_ID: 1725 - MASTER_BRANCH_MANIFEST: kirkstone - GITLAB_CI_REVISION: 91dc115a3aa08fdf5d48e0f88ef44661f85c90c2 + MASTER_BRANCH: kirkstone + GITLAB_CI_REVISION: 8a38f19499ac4da8b34d66c04fd47fef771f3aa9 generate-build-jobs: variables: diff --git a/SRCREV.conf b/SRCREV.conf index a072137ca7b84ef1a603fcf9a42c185277337142..2a489731af5b9ad2354533986a39c7aace95abd4 100644 --- a/SRCREV.conf +++ b/SRCREV.conf @@ -1,15 +1,15 @@ -SRCREV:pn-egalaxi2c = "eacee19fe2bf02c8a00e25eb4494390d03c3cedd" -SRCREV:pn-emc-test-suite = "165940b82fc967432426b1d174d82c20eb9fb7fa" -SRCREV:pn-gf-productiontests = "543b080a44dc3779f9ec76637e1f11215d0d88bb" -SRCREV:pn-gfeeprom = "da91b5d97d419975d31a95e8f13e4bc83ee613d4" -SRCREV:pn-gfplatdetect = "bf3dbf8dc1707c41efdf863c0d3762dd1a2005be" -SRCREV:pn-gfxml2dto = "ab5f14f86cff9ae27fbbc7765f9a1b06824dbd2a" -SRCREV:pn-seco-show-demo = "e6c40f81c575093a73b96b83a3439d68cdd62bcb" -SRCREV:pn-libmdb = "55460e3e3354883533be3554e9ede3303d626f7b" -SRCREV:pn-linux-guf = "46b3952e3b35b91088408cf4e607fcf781fe963f" -SRCREV:pn-linux-imx = "482dc0dc7ab8054e546dff6c9e3f3579ea1289c4" +SRCREV:pn-egalaxi2c = "90ac7cb56200a70f996e745dc89a3ef7134e5c6d" +SRCREV:pn-emc-test-suite = "9705e5e99594585dc79f42f41111b0c5d9c8216c" +SRCREV:pn-gf-productiontests = "e828a2c75b81e56cccf1a8846805a92aa49d6dbe" +SRCREV:pn-gfeeprom = "320806fcf35fde658ef384fa157fa5be1c520794" +SRCREV:pn-gfplatdetect = "d44d173c559921e23bfa874cdaa66908e3df3ad2" +SRCREV:pn-gfxml2dto = "ffb04d83173a7a7973bbf61929b456ce3967d695" +SRCREV:pn-seco-show-demo = "c9d00df4c99f1f68c62e5c7362c937c6fa7029de" +SRCREV:pn-libmdb = "369fdec0110e2a19cfc2ed8ad6388644344abb94" +SRCREV:pn-linux-guf = "6b31583dc957bc31c8813f41bbb1e9db9053e59d" +SRCREV:pn-linux-imx = "91a08a7ba4119ea2f1f37df2ef9c253973914fb9" SRCREV:pn-linux-imx-kuk = "6eac325df3391a9501d7a2fb8ef098f8928b9a60" -SRCREV:pn-touchcal-conv = "1e8a19e459299c4a77de9b04a1828a79613d7eea" -SRCREV:pn-u-boot-imx = "cedbe2148f087d8fed93db26e5daee49d18113ad" -SRCREV:pn-xconfig = "56afeb74eb5672982584291ffb6e0008d3756080" -SRCREV:pn-qt-multi-screen-compositor = "2df88780ca597b070b3b80cee78b7408a1678f07" +SRCREV:pn-touchcal-conv = "636836acf9b9753d93d65f783a071e093799378f" +SRCREV:pn-u-boot-imx = "b6c329ef585373cb12f6db292b947a9469a8b4b3" +SRCREV:pn-xconfig = "9a80a8452c291f4bc56f8ab24c3b947926e859b8" +SRCREV:pn-qt-multi-screen-compositor = "806b319f43192c3bea0941df008f174c90d051ae" diff --git a/default.xml b/default.xml index f326ee818c0f755b070d7706a28d15cab74f55ab..364562208a352030378777b96a237289f314615d 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="c8982925ced33fd8ec14a83c6bcf6b4c837aa68a" remote="seco-ne" path="sources/meta-seconorth-machine" /> - <project name="layers/meta-seconorth-distro" revision="247db5f3c9fd971a51b7b7da60d16530c1c3d090" remote="seco-ne" path="sources/meta-seconorth-distro" /> - <project name="layers/meta-seconorth-nogplv3" revision="9ba8e4a89e3e0639c81a946a18294c66b161ad52" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> - <project name="config" revision="39ac7a10e545d364d1f3bbf0db6920b99f0bf44a" remote="seco-ne" path=".conf" > + <project name="layers/meta-seconorth-machine" revision="565be41b7d3d6142ab09fc8bd706e3a801ca9b95" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-distro" revision="c1795114b37eac3a698b869f0420ea58d33d4507" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="995fe968bba9bda7cab4ff69e31a584b92e4fc27" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="bbe176f85537e38471a79054fe2e5e73aa109f15" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project>