From 53ea3b8b28a2c662adce03232d072623bc9bd89c Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@seco.com> Date: Thu, 28 Sep 2023 09:36:50 +0000 Subject: [PATCH] Integrate gitlab-ci/custom-manifest-file -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/cf0336d66f92c09f8b0bc404e10c267fc6bb601d Define manifest file to build from --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- SRCREV.conf | 42 +++++++++++++++++++++--------------------- default.xml | 8 ++++---- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index a7503809..cf0336d6 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit a750380925102dda54b0159a27adce3a7e5cf7db +Subproject commit cf0336d66f92c09f8b0bc404e10c267fc6bb601d diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21f4b131..19dee9ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,13 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: a750380925102dda54b0159a27adce3a7e5cf7db + ref: cf0336d66f92c09f8b0bc404e10c267fc6bb601d file: 'manifest-pipeline-yocto.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH: kirkstone - GITLAB_CI_REVISION: a750380925102dda54b0159a27adce3a7e5cf7db + GITLAB_CI_REVISION: cf0336d66f92c09f8b0bc404e10c267fc6bb601d generate-build-pipeline: variables: diff --git a/SRCREV.conf b/SRCREV.conf index f4f27a61..0602e793 100644 --- a/SRCREV.conf +++ b/SRCREV.conf @@ -1,22 +1,22 @@ -SRCREV:pn-atmel-mxt = "1ee2b19d1ae115ee26d475b60674eec2346d8ab0" -SRCREV:pn-egalaxi2c = "7c4a64cc5422de71408475dbaaf1b425b26f1488" -SRCREV:pn-emc-test-suite = "e00083d1e27ff229c65444fc6160fdd172ac98f1" -SRCREV:pn-gf-productiontests = "a1e6db7c8aefa1215876cd583ec198250fd79a48" -SRCREV:pn-gfeeprom = "230c97656e83401ca363facff8a6443b202f5934" -SRCREV:pn-gfplatdetect = "247cd2e99430e12e2d218905a5cfc7cc0e93186d" -SRCREV:pn-gfxml2dto = "404518c6a1b8e91c8921ad423b531ec277759952" -SRCREV:pn-ilitek = "9f8ee4b809f0f723de3634b5a1cc65153bcbf601" -SRCREV:pn-kernel-module-touchgpio = "b322d3d93f79009286ab852ce23f2041d273dca7" -SRCREV:pn-libmdb = "eced72428db0148c9ca9708251879b1a8926ef9d" -SRCREV:pn-linux-imx = "97d0fa90b2b4b37cc5c0d8a5417271f18206d610" +SRCREV:pn-atmel-mxt = "8d021171a3c4004a6dc92330051f4129592e9e98" +SRCREV:pn-egalaxi2c = "981eb523c599acd87f49d2fb55936603147be8f8" +SRCREV:pn-emc-test-suite = "8fb65321c39fa222635e0a05c1a0479aa251b42a" +SRCREV:pn-gf-productiontests = "09d72247db843ef41d4b609f1a3df808deaf5bff" +SRCREV:pn-gfeeprom = "0a7a918f248fe734d4a09a8a8d1322d804b1b463" +SRCREV:pn-gfplatdetect = "0fbd2c233e5adbc1a7775f84a7cfe5c91677d383" +SRCREV:pn-gfxml2dto = "7ba3b04e929dadb15c1f1dc1bb23fda3aab92995" +SRCREV:pn-ilitek = "832639d983eac75528fc77320158251b87f1beaf" +SRCREV:pn-kernel-module-touchgpio = "b2d4c89027b818694733c581fa828e53e55e024d" +SRCREV:pn-libmdb = "f8fb2375536e72b37cef3f0e843c61e9335de928" +SRCREV:pn-linux-imx = "641e5d11019b79ac51daeed621d306dd724a9e34" SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a" -SRCREV:pn-linux-seconorth = "997711c52aa0dfad6f3e7c7028a791b4b35c7919" -SRCREV:pn-qt-multi-screen-compositor = "ce2b7e5c7f3c601e0538c36375083bd9c5515599" -SRCREV:pn-seco-sharedconf = "cfe6c9355d8e0cd1fd758681df20ab03b1e2df3c" -SRCREV:pn-seco-show-demo = "01bd740f5b0916fb803ac3ccb9687d5702e66f4f" -SRCREV:pn-seco-yocto-testsuite = "e0e5fc71668afdfc00bba317102f57eedc73e13f" -SRCREV:pn-secure-element-examples = "9156c1abc459b2716c11e6b5dab26f9b4b2b7f68" -SRCREV:pn-touchcal-conv = "f762f2fdaa7ec531b8bee23a141cab32814e94b5" -SRCREV:pn-u-boot-seco-imx = "5c149fc9ffecfa6e40f13bd136dedfec9e1a8f1a" -SRCREV:pn-xconfig = "8fa7b8b923b7dee5ec6f7f6011cc03d537b65fe3" -SRCREV:pn-yocto-install = "21a33efddef088440ca518202b67104785e1e8fd" +SRCREV:pn-linux-seconorth = "ac6c42b718b3b477d6e06f01cfc0adb500645585" +SRCREV:pn-qt-multi-screen-compositor = "0ce22128b0cb7b7a081ff99e77394471827fba14" +SRCREV:pn-seco-sharedconf = "5457b671469bacab5c3220e46f4599d803728ea2" +SRCREV:pn-seco-show-demo = "62d6cee0d3336bd9d8261ae30c065b17217d6e88" +SRCREV:pn-seco-yocto-testsuite = "62618df26b7c2e5b4edb46184f01e0025ecbe48f" +SRCREV:pn-secure-element-examples = "cb33948b33bc0f1127318b7512764a35ec1ea4d5" +SRCREV:pn-touchcal-conv = "f23a138171c9b99267728481b42f39d2e3710b83" +SRCREV:pn-u-boot-seco-imx = "2c8d8934ac98e4e1351dc6a1be0753779f124411" +SRCREV:pn-xconfig = "616d4d3200e33261bc6e8b6c395e1a47aef90083" +SRCREV:pn-yocto-install = "68ce68f068f1afee6b782606f5e12fbe7833cd7e" diff --git a/default.xml b/default.xml index 4952b737..da0b6ee0 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="6ad0ad644d5709d6828db4d7d248bc3624a1ea04" remote="seco-ne" path="sources/meta-seconorth-machine" /> - <project name="layers/meta-seconorth-distro" revision="2ce364fd8cd7c4a5ecc8864eabb9e8ed9e0c8b2b" remote="seco-ne" path="sources/meta-seconorth-distro" /> - <project name="layers/meta-seconorth-nogplv3" revision="7568f1bba0c6776521416f200b121bfdd08f4d9e" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> - <project name="config" revision="db5ff0508885db5fc46ce5518d3843e54d114bd0" remote="seco-ne" path=".conf" > + <project name="layers/meta-seconorth-machine" revision="c2dd2c00eb745411567ab9726d61dbe8b0fe600b" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-distro" revision="f723084b4a0d3eac8c5ffce6eb4288752a581181" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="464e4bdb390773f24894875c3fe652601bc3624c" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="701420d8fc8b8cb24e97cb1df4bd2318e13f01f8" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project> -- GitLab