diff options
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | base/pinned.xml | 8 | ||||
| -rw-r--r-- | bsp/pinned-nxp.xml | 4 | ||||
| -rw-r--r-- | bsp/pinned-tdx.xml | 6 | ||||
| -rw-r--r-- | tdxref/default.xml | 6 | ||||
| -rw-r--r-- | tdxref/integration.xml | 2 | ||||
| -rw-r--r-- | tester/default.xml | 17 | ||||
| -rw-r--r-- | tester/integration.xml | 17 | ||||
| -rw-r--r-- | tester/next.xml | 17 | ||||
| -rw-r--r-- | tezi/default.xml | 6 | ||||
| -rw-r--r-- | tezi/integration.xml | 2 | ||||
| -rw-r--r-- | torizoncore/default.xml | 16 | ||||
| -rw-r--r-- | torizoncore/integration.xml | 14 | ||||
| -rw-r--r-- | torizoncore/next.xml | 10 |
14 files changed, 76 insertions, 50 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8dcf21f..b221582 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,6 @@ repo-sync: - ORIGIN=$(git remote get-url origin) - mkdir -p bin - wget -O bin/repo https://commondatastorage.googleapis.com/git-repo-downloads/repo - - sed -i 's/\(\#\!\/usr\/bin\/env \)python/\1python3/' bin/repo - chmod a+x bin/repo - mkdir -p workspace - cd workspace diff --git a/base/pinned.xml b/base/pinned.xml index 6b8068d..787da3f 100644 --- a/base/pinned.xml +++ b/base/pinned.xml @@ -5,8 +5,8 @@ <default sync-j="4"/> - <project name="bitbake.git" path="layers/openembedded-core/bitbake" remote="oe" revision="c0348de8121c3a842bf44906f7e2f79e93f7275b" upstream="1.46"/> - <project name="meta-openembedded.git" path="layers/meta-openembedded" remote="oe" revision="7889158dcd187546fc5e99fd81d0779cad3e8d17" upstream="dunfell"/> - <project name="meta-yocto" path="layers/meta-yocto" remote="yocto" revision="8a9d89df2c50128130a40119a4827ace761c236c" upstream="dunfell"/> - <project name="openembedded-core.git" path="layers/openembedded-core" remote="oe" revision="44b1970c40e9d73f6e63fb10cdc55837a26f5921" upstream="dunfell"/> + <project name="bitbake.git" path="layers/openembedded-core/bitbake" remote="oe" revision="7ce4107bf824b3e115b40558336de25f99af31f8" upstream="1.46"/> + <project name="meta-openembedded.git" path="layers/meta-openembedded" remote="oe" revision="c74ebbddfd9dbe02d3f7422016324451eb218e1e" upstream="dunfell"/> + <project name="meta-yocto" path="layers/meta-yocto" remote="yocto" revision="35a5299b48fdd8ea03826c7350a547ea8e836428" upstream="dunfell"/> + <project name="openembedded-core.git" path="layers/openembedded-core" remote="oe" revision="b49b0a3dd74c24f3a011c9c0b5cf8f6530956cfa" upstream="dunfell"/> </manifest>
\ No newline at end of file diff --git a/bsp/pinned-nxp.xml b/bsp/pinned-nxp.xml index fc52a44..6e8a4ea 100644 --- a/bsp/pinned-nxp.xml +++ b/bsp/pinned-nxp.xml @@ -2,7 +2,7 @@ <manifest> <remote alias="repo" fetch="https://github.com/Freescale" name="githf"/> - <project name="meta-freescale-3rdparty.git" path="layers/meta-freescale-3rdparty" remote="githf" revision="c52f64973cd4043a5e8be1c7e29bb9690eb4c3e5" upstream="dunfell"/> + <project name="meta-freescale-3rdparty.git" path="layers/meta-freescale-3rdparty" remote="githf" revision="5ae8890c1a64271636bcd7773996bddd51e700d8" upstream="dunfell"/> <project name="meta-freescale-distro.git" path="layers/meta-freescale-distro" remote="githf" revision="5d882cdf079b3bde0bd9869ce3ca3db411acbf3b" upstream="dunfell"/> - <project name="meta-freescale.git" path="layers/meta-freescale" remote="githf" revision="6d2922bee372157454e422df518b6cf0bfcf6700" upstream="dunfell"/> + <project name="meta-freescale.git" path="layers/meta-freescale" remote="githf" revision="501032fb30abbad54616a2d9bb4555c297fc35b6" upstream="dunfell"/> </manifest>
\ No newline at end of file diff --git a/bsp/pinned-tdx.xml b/bsp/pinned-tdx.xml index f04ba2d..6d0bc3c 100644 --- a/bsp/pinned-tdx.xml +++ b/bsp/pinned-tdx.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <manifest> <remote alias="repo" fetch="https://git.toradex.com" name="tdx"/> - <project name="meta-toradex-bsp-common.git" path="layers/meta-toradex-bsp-common" remote="tdx" revision="4b876a0ecbe04eb924abf2442249c2cae3231d21" upstream="dunfell-5.x.y"/> - <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="4d9bf383a656759a574b3d82cb8b90b0e2663e50" upstream="dunfell-5.x.y"/> - <project name="meta-toradex-tegra.git" path="layers/meta-toradex-tegra" remote="tdx" revision="84b975b3e5fd834f9bec5ea398edf0c0ab911cd1" upstream="dunfell-5.x.y"/> + <project name="meta-toradex-bsp-common.git" path="layers/meta-toradex-bsp-common" remote="tdx" revision="b9fbc0307cbd77b78aac194f8ae00e9b734736fb" upstream="dunfell-5.x.y"/> + <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="5763fe5bfa7645cd8f148f0ef0dcf83c43d38475" upstream="dunfell-5.x.y"/> + <project name="meta-toradex-tegra.git" path="layers/meta-toradex-tegra" remote="tdx" revision="f11bdbda6117af9e0e344dd31b6958775a8566ca" upstream="dunfell-5.x.y"/> </manifest>
\ No newline at end of file diff --git a/tdxref/default.xml b/tdxref/default.xml index 653fbd2..2491e62 100644 --- a/tdxref/default.xml +++ b/tdxref/default.xml @@ -6,9 +6,9 @@ <include name="bsp/pinned-nxp.xml"/> <include name="bsp/pinned-tdx.xml"/> - <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="b4d24d70aca75791902df5cd59a4f4a54aa4a125" upstream="dunfell"/> - <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="eeaa1fa0f22496a84d42c2b54e4ae23b567b07f2" upstream="dunfell-5.x.y"/> - <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="e835edf3bc368fc6beb64acefa96a349ec6da281" upstream="dunfell-5.x.y"> + <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="5ef3a0ffd3324937252790266e2b2e64d33ef34f" upstream="dunfell"/> + <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="8ffadb517be04a0b19ef1f5d5299a8c581f87383" upstream="dunfell-5.x.y"/> + <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="b72627047958f6b517760e32773cc00057c2499c" upstream="dunfell-5.x.y"> <copyfile dest="export" src="buildconf/export"/> </project> </manifest>
\ No newline at end of file diff --git a/tdxref/integration.xml b/tdxref/integration.xml index 5bfd576..3a4ad5f 100644 --- a/tdxref/integration.xml +++ b/tdxref/integration.xml @@ -6,7 +6,7 @@ <include name="bsp/pinned-nxp.xml"/> <include name="bsp/integration-tdx.xml"/> - <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="b4d24d70aca75791902df5cd59a4f4a54aa4a125" upstream="dunfell"/> + <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="5ef3a0ffd3324937252790266e2b2e64d33ef34f" upstream="dunfell"/> <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="dunfell-5.x.y"/> <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="dunfell-5.x.y"> <copyfile dest="export" src="buildconf/export"/> diff --git a/tester/default.xml b/tester/default.xml index 55db852..6a0ae65 100644 --- a/tester/default.xml +++ b/tester/default.xml @@ -4,9 +4,20 @@ <include name="bsp/pinned-nxp.xml" /> <include name="bsp/pinned-tdx.xml" /> - <remote alias="repo" fetch="http://gitlab.toradex.int/som-fct" name="trdx-int"/> + <remote alias="repo" fetch="https://github.com/meta-qt5" name="githq"/> + <remote alias="repo" fetch="https://github.com/toradex" name="githt"/> + <remote alias="repo" fetch="https://gitlab.int.toradex.com/rd/testing/som-fct" name="tdx-int"/> - <project name="meta-toradex-tester.git" path="layers/meta-toradex-tester" remote="trdx-int" revision="2767d22ea6fa06fdee19ddaab35f56a12dc9e804" upstream="dunfell-5.x.y"> - <copyfile dest="export" src="buildconf/export"/> + <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="5ef3a0ffd3324937252790266e2b2e64d33ef34f" upstream="dunfell"/> + <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="8ffadb517be04a0b19ef1f5d5299a8c581f87383" upstream="dunfell-5.x.y"/> + <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="b72627047958f6b517760e32773cc00057c2499c" upstream="dunfell-5.x.y"/> + <project dest-branch="dunfell-5.x.y" name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="9b1aa3e02c245176d65ca44d5da406eb9750235e" upstream="dunfell-5.x.y"/> + + <project name="meta-toradex-somfctdut.git" path="layers/meta-toradex-somfctdut" remote="tdx-int" revision="8d38d4494a2ebb2b1823e63eda14167cb5c8dac9" upstream="dunfell-5.x.y"> + <copyfile dest="export_somfctdut" src="buildconf/export"/> + </project> + + <project name="meta-toradex-somfctcm.git" path="layers/meta-toradex-somfctcm" remote="tdx-int" revision="fa9f95c3f62e6e3966cbc203f93a4502a2f5bc56" upstream="dunfell-5.x.y"> + <copyfile dest="export_somfctcm" src="buildconf/export"/> </project> </manifest> diff --git a/tester/integration.xml b/tester/integration.xml index f585bdb..c50adfb 100644 --- a/tester/integration.xml +++ b/tester/integration.xml @@ -4,9 +4,20 @@ <include name="bsp/pinned-nxp.xml" /> <include name="bsp/integration-tdx.xml" /> - <remote alias="repo" fetch="http://gitlab.toradex.int/som-fct" name="trdx-int"/> + <remote alias="repo" fetch="https://github.com/meta-qt5" name="githq"/> + <remote alias="repo" fetch="https://github.com/toradex" name="githt"/> + <remote alias="repo" fetch="https://gitlab.int.toradex.com/rd/testing/som-fct" name="tdx-int"/> - <project name="meta-toradex-tester.git" path="layers/meta-toradex-tester" remote="trdx-int" revision="dunfell-5.x.y"> - <copyfile dest="export" src="buildconf/export"/> + <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="5ef3a0ffd3324937252790266e2b2e64d33ef34f" upstream="dunfell"/> + <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="dunfell-5.x.y"/> + <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="dunfell-5.x.y"/> + <project name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="dunfell-5.x.y"/> + + <project name="meta-toradex-somfctdut.git" path="layers/meta-toradex-somfctdut" remote="tdx-int" revision="dunfell-5.x.y"> + <copyfile dest="export_somfctdut" src="buildconf/export"/> + </project> + + <project name="meta-toradex-somfctcm.git" path="layers/meta-toradex-somfctcm" remote="tdx-int" revision="dunfell-5.x.y"> + <copyfile dest="export_somfctcm" src="buildconf/export"/> </project> </manifest> diff --git a/tester/next.xml b/tester/next.xml index ab3e0b7..681354d 100644 --- a/tester/next.xml +++ b/tester/next.xml @@ -4,9 +4,20 @@ <include name="bsp/integration-nxp.xml" /> <include name="bsp/integration-tdx.xml" /> - <remote alias="repo" fetch="http://gitlab.toradex.int/som-fct" name="trdx-int"/> + <remote alias="repo" fetch="https://github.com/meta-qt5" name="githq"/> + <remote alias="repo" fetch="https://github.com/toradex" name="githt"/> + <remote alias="repo" fetch="https://gitlab.int.toradex.com/rd/testing/som-fct" name="tdx-int"/> - <project name="meta-toradex-tester.git" path="layers/meta-toradex-tester" remote="trdx-int" revision="dunfell-5.x.y"> - <copyfile dest="export" src="buildconf/export"/> + <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="dunfell"/> + <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="dunfell-5.x.y"/> + <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="dunfell-5.x.y"/> + <project name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="dunfell-5.x.y"/> + + <project name="meta-toradex-somfctdut.git" path="layers/meta-toradex-somfctdut" remote="tdx-int" revision="dunfell-5.x.y"> + <copyfile dest="export_somfctdut" src="buildconf/export"/> + </project> + + <project name="meta-toradex-somfctcm.git" path="layers/meta-toradex-somfctcm" remote="tdx-int" revision="dunfell-5.x.y"> + <copyfile dest="export_somfctcm" src="buildconf/export"/> </project> </manifest> diff --git a/tezi/default.xml b/tezi/default.xml index fedcdf7..e2e25bc 100644 --- a/tezi/default.xml +++ b/tezi/default.xml @@ -7,10 +7,10 @@ <include name="bsp/pinned-nxp.xml"/> <include name="bsp/pinned-tdx.xml"/> - <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="b4d24d70aca75791902df5cd59a4f4a54aa4a125" upstream="dunfell"/> + <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="5ef3a0ffd3324937252790266e2b2e64d33ef34f" upstream="dunfell"/> <!-- meta-toradex-distro is used for bumpSRCREV --> - <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="e835edf3bc368fc6beb64acefa96a349ec6da281"/> - <project dest-branch="dunfell-5.x.y" name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="06a642c01f04772bb9fa7596d8ffd18a0d82cbe6" upstream="dunfell-5.x.y"> + <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="b72627047958f6b517760e32773cc00057c2499c"/> + <project dest-branch="dunfell-5.x.y" name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="9b1aa3e02c245176d65ca44d5da406eb9750235e" upstream="dunfell-5.x.y"> <copyfile dest="export" src="buildconf/export"/> </project> </manifest>
\ No newline at end of file diff --git a/tezi/integration.xml b/tezi/integration.xml index 95e4ca8..65dd81b 100644 --- a/tezi/integration.xml +++ b/tezi/integration.xml @@ -7,7 +7,7 @@ <include name="bsp/pinned-nxp.xml"/> <include name="bsp/integration-tdx.xml"/> - <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="b4d24d70aca75791902df5cd59a4f4a54aa4a125" upstream="dunfell"/> + <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="5ef3a0ffd3324937252790266e2b2e64d33ef34f" upstream="dunfell"/> <!-- meta-toradex-distro is used for bumpSRCREV --> <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="dunfell-5.x.y"/> <project name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="dunfell-5.x.y"> diff --git a/torizoncore/default.xml b/torizoncore/default.xml index 6a5a164..910f0c7 100644 --- a/torizoncore/default.xml +++ b/torizoncore/default.xml @@ -4,16 +4,14 @@ <include name="bsp/pinned-nxp.xml"/> <include name="bsp/pinned-tdx.xml"/> - <remote alias="repo" fetch="https://github.com/advancedtelematic" name="ats"/> - <remote alias="repo" fetch="https://github.com/toradex" name="toradex-torizon"/> - <remote alias="repo" fetch="https://github.com/foundriesio" name="foundriesio"/> + <remote alias="repo" fetch="https://github.com/uptane" name="uptane"/> + <remote alias="repo" fetch="https://github.com/torizon" name="torizon"/> - <project name="meta-lmp" path="layers/meta-lmp" remote="foundriesio" revision="f838fe62de6da3bc3583613d1a3659e219ff6f72"/> - <project name="meta-security" path="layers/meta-security" remote="yocto" revision="b76698c788cb8ca632077a972031899ef15025d6"/> - <project name="meta-updater" path="layers/meta-updater" remote="ats" revision="5d49b28570ed030924ed5d45fbced24d3cb6e588"/> - <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="180241e0eee718fc52c7b6b25dbd1d845a8047c4"/> - <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="e835edf3bc368fc6beb64acefa96a349ec6da281"/> - <project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="toradex-torizon" revision="dc7d122bdaa2e5f560212a87b0f82259db4f1083"> + <project name="meta-security" path="layers/meta-security" remote="yocto" revision="eb631c12be585d18beddbb41f6035772b2cb17d5"/> + <project name="meta-updater" path="layers/meta-updater" remote="uptane" revision="8e02177c2d9fa416f3117c5da1c0dfba7709dfbf"/> + <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="35c723774ee06b3c1831f00a2cbf25cbeae132e1"/> + <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="b72627047958f6b517760e32773cc00057c2499c"/> + <project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="torizon" revision="34af8f469f3b2266004b0ec44a978e9ad093e6e0"> <linkfile dest="setup-environment" src="scripts/setup-environment"/> </project> </manifest>
\ No newline at end of file diff --git a/torizoncore/integration.xml b/torizoncore/integration.xml index 0b12bbf..8ec488f 100644 --- a/torizoncore/integration.xml +++ b/torizoncore/integration.xml @@ -4,16 +4,14 @@ <include name="bsp/pinned-nxp.xml"/> <include name="bsp/integration-tdx.xml"/> - <remote alias="repo" fetch="https://github.com/advancedtelematic" name="ats"/> - <remote alias="repo" fetch="https://github.com/toradex" name="toradex-torizon"/> - <remote alias="repo" fetch="https://github.com/foundriesio" name="foundriesio"/> + <remote alias="repo" fetch="https://github.com/uptane" name="uptane"/> + <remote alias="repo" fetch="https://github.com/torizon" name="torizon"/> - <project name="meta-lmp" path="layers/meta-lmp" remote="foundriesio" revision="f838fe62de6da3bc3583613d1a3659e219ff6f72"/> - <project name="meta-security" path="layers/meta-security" remote="yocto" revision="b76698c788cb8ca632077a972031899ef15025d6"/> - <project name="meta-updater" path="layers/meta-updater" remote="ats" revision="5d49b28570ed030924ed5d45fbced24d3cb6e588"/> - <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="180241e0eee718fc52c7b6b25dbd1d845a8047c4"/> + <project name="meta-security" path="layers/meta-security" remote="yocto" revision="eb631c12be585d18beddbb41f6035772b2cb17d5"/> + <project name="meta-updater" path="layers/meta-updater" remote="uptane" revision="8e02177c2d9fa416f3117c5da1c0dfba7709dfbf"/> + <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="35c723774ee06b3c1831f00a2cbf25cbeae132e1"/> <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="dunfell-5.x.y"/> - <project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="toradex-torizon" revision="dunfell-5.x.y"> + <project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="torizon" revision="dunfell-5.x.y"> <linkfile dest="setup-environment" src="scripts/setup-environment"/> </project> </manifest> diff --git a/torizoncore/next.xml b/torizoncore/next.xml index 14f2b16..02da82d 100644 --- a/torizoncore/next.xml +++ b/torizoncore/next.xml @@ -4,16 +4,14 @@ <include name="bsp/integration-nxp.xml" /> <include name="bsp/integration-tdx.xml" /> - <remote alias="repo" fetch="https://github.com/advancedtelematic" name="ats"/> - <remote alias="repo" fetch="https://github.com/toradex" name="toradex-torizon"/> - <remote alias="repo" fetch="https://github.com/foundriesio" name="foundriesio"/> + <remote alias="repo" fetch="https://github.com/uptane" name="uptane"/> + <remote alias="repo" fetch="https://github.com/torizon" name="torizon"/> - <project name="meta-lmp" path="layers/meta-lmp" remote="foundriesio" revision="dunfell"/> <project name="meta-security" path="layers/meta-security" remote="yocto" revision="dunfell"/> - <project name="meta-updater" path="layers/meta-updater" remote="ats" revision="dunfell"/> + <project name="meta-updater" path="layers/meta-updater" remote="uptane" revision="dunfell"/> <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="dunfell"/> <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="dunfell-5.x.y"/> - <project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="toradex-torizon" revision="dunfell-5.x.y"> + <project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="torizon" revision="dunfell-5.x.y"> <linkfile dest="setup-environment" src="scripts/setup-environment"/> </project> </manifest> |