diff options
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | base/pinned.xml | 8 | ||||
| -rw-r--r-- | bsp/pinned-nxp.xml | 6 | ||||
| -rw-r--r-- | bsp/pinned-tdx.xml | 6 | ||||
| -rw-r--r-- | bsp/pinned-ti.xml | 6 | ||||
| -rw-r--r-- | tdxref/default.xml | 8 | ||||
| -rw-r--r-- | tdxref/integration.xml | 6 | ||||
| -rw-r--r-- | tezi/default.xml | 8 | ||||
| -rw-r--r-- | tezi/integration.xml | 6 | ||||
| -rw-r--r-- | tezi/next.xml | 4 | ||||
| -rw-r--r-- | torizoncore/integration.xml | 8 |
11 files changed, 33 insertions, 34 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0008f40..6aad8ac 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 4aec828..7b0c6c7 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="c19035e8e71c419c5688a86bfc9c946c96f638e8" upstream="master"/> - <project name="meta-openembedded.git" path="layers/meta-openembedded" remote="oe" revision="ea63f13846f47636b5caac7c5c38b6f7fcd66536" upstream="master"/> - <project name="meta-yocto" path="layers/meta-yocto" remote="yocto" revision="535ef93ef68af20b06effb0dd899895a192bb412" upstream="master"/> - <project name="openembedded-core.git" path="layers/openembedded-core" remote="oe" revision="fa3f1f67abae1d90bede2e98bf7293603fd1307c" upstream="master"/> + <project name="bitbake.git" path="layers/openembedded-core/bitbake" remote="oe" revision="6366ea8d9c284d10bb8f4129004b55239d9022c0" upstream="master"/> + <project name="meta-openembedded.git" path="layers/meta-openembedded" remote="oe" revision="5a02b76b82d1f48986212c33dddf7986385c79ef" upstream="master"/> + <project name="meta-yocto" path="layers/meta-yocto" remote="yocto" revision="3b45bc4faa620ecf11eb117252e6cd6c5e7d0a09" upstream="master"/> + <project name="openembedded-core.git" path="layers/openembedded-core" remote="oe" revision="486ed69939f1b7572f121960c2dde246032686e7" upstream="master"/> </manifest>
\ No newline at end of file diff --git a/bsp/pinned-nxp.xml b/bsp/pinned-nxp.xml index f71dd5b..be6caec 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="2441b91ef5997fdcf7127fbe97ac7e4568dd83a4" upstream="master"/> - <project name="meta-freescale-distro.git" path="layers/meta-freescale-distro" remote="githf" revision="a4efa17a9f6b25d8d9290dfee8275059d40b83df" upstream="master"/> - <project name="meta-freescale.git" path="layers/meta-freescale" remote="githf" revision="fce8af0b0742fbeb0fd000912d54a615f8909351" upstream="master"/> + <project name="meta-freescale-3rdparty.git" path="layers/meta-freescale-3rdparty" remote="githf" revision="8b61684f0b1ba8bacdf3a69d993445e9791d4932" upstream="master"/> + <project name="meta-freescale-distro.git" path="layers/meta-freescale-distro" remote="githf" revision="3691cb207b610cf505c3a1f8d5d7757814f79967" upstream="master"/> + <project name="meta-freescale.git" path="layers/meta-freescale" remote="githf" revision="4968b000daa74e959da40ed6fccd25a22eb39f61" upstream="master"/> </manifest>
\ No newline at end of file diff --git a/bsp/pinned-tdx.xml b/bsp/pinned-tdx.xml index cf75d59..356e320 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="351d72f3c0b3ac5b13ad438b33ff3e5019e70d64" upstream="master"/> - <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="5ee28ba98d0b69666c6a66fd36516e31a26a73a7" upstream="master"/> - <project name="meta-toradex-ti.git" path="layers/meta-toradex-ti" remote="tdx" revision="758654bc4cc20243f47e31aab9e4351911da745f" upstream="master"/> + <project name="meta-toradex-bsp-common.git" path="layers/meta-toradex-bsp-common" remote="tdx" revision="bbada14657006718ebc3568e762c293369fe0098" upstream="master"/> + <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="224519bfe3009cf74d937c89cfe3a57f49d0ac2d" upstream="master"/> + <project name="meta-toradex-ti.git" path="layers/meta-toradex-ti" remote="tdx" revision="1e660d3369cd4a7b56a8ba5913ee07383e7308b7" upstream="master"/> </manifest> diff --git a/bsp/pinned-ti.xml b/bsp/pinned-ti.xml index a25c886..6b40d98 100644 --- a/bsp/pinned-ti.xml +++ b/bsp/pinned-ti.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <manifest> - <project name="meta-arm" path="layers/meta-arm" remote="yocto" revision="efa053885f63a82618cf14d9bb5a1143d52edb9a" upstream="master"/> - <project name="meta-ti" path="layers/meta-ti" remote="yocto" revision="6a00c74301f9056c0c5462b16955bb5af76c2745" upstream="master"/> -</manifest> + <project name="meta-arm" path="layers/meta-arm" remote="yocto" revision="d9e18ce7920fd4b6216fbda6c7938450aa3b45b7" upstream="master"/> + <project name="meta-ti" path="layers/meta-ti" remote="yocto" revision="0584bef40f3806613d0d2c3ff0c990705cba3a5b" upstream="master"/> +</manifest>
\ No newline at end of file diff --git a/tdxref/default.xml b/tdxref/default.xml index 7bfafbb..9718ee3 100644 --- a/tdxref/default.xml +++ b/tdxref/default.xml @@ -7,10 +7,10 @@ <include name="bsp/pinned-ti.xml"/> <include name="bsp/pinned-tdx.xml" /> - <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="1d1b19ff577835bf847152eed44d52e8267d9093" upstream="master"/> - <project name="meta-security" path="layers/meta-security" remote="yocto" revision="070a1e82cc59424d230a23c0b2a104b01fbaa2ad" upstream="master"/> - <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="5de0bb7014e1446c91a0e71010087c03ca494937" upstream="master"/> - <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="c9bd57bd65a1bdc9c7a52e6084fc4eaff508dd5c" upstream="master"> + <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="b8e1ae8ce6140f6084388842751280b55d55988b" upstream="master"/> + <project name="meta-security" path="layers/meta-security" remote="yocto" revision="283a773f24cedacb45def943a455bc3607f8a7a1" upstream="master"/> + <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="266c29d50d7e80dd190f146e41cdef55adb6df53" upstream="master"/> + <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="0ceda8300f359e74364d00c3877a6bd8ec7701eb" upstream="master"> <copyfile dest="export" src="buildconf/export"/> </project> </manifest> diff --git a/tdxref/integration.xml b/tdxref/integration.xml index ad73951..2c6bc92 100644 --- a/tdxref/integration.xml +++ b/tdxref/integration.xml @@ -7,10 +7,10 @@ <include name="bsp/pinned-ti.xml"/> <include name="bsp/integration-tdx.xml"/> - <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="1d1b19ff577835bf847152eed44d52e8267d9093" upstream="master"/> - <project name="meta-security" path="layers/meta-security" remote="yocto" revision="070a1e82cc59424d230a23c0b2a104b01fbaa2ad" upstream="master"/> + <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="b8e1ae8ce6140f6084388842751280b55d55988b" upstream="master"/> + <project name="meta-security" path="layers/meta-security" remote="yocto" revision="283a773f24cedacb45def943a455bc3607f8a7a1" upstream="master"/> <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="master"/> <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="master"> <copyfile dest="export" src="buildconf/export"/> </project> -</manifest> +</manifest>
\ No newline at end of file diff --git a/tezi/default.xml b/tezi/default.xml index 2615487..f70d77c 100644 --- a/tezi/default.xml +++ b/tezi/default.xml @@ -8,10 +8,10 @@ <include name="bsp/pinned-ti.xml"/> <include name="bsp/pinned-tdx.xml"/> - <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="cf6ffcbad5275a3428f6046468a0c9d572e813d1" upstream="master"/> + <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="b8e1ae8ce6140f6084388842751280b55d55988b" upstream="master"/> <!-- meta-toradex-distro is used for bumpSRCREV --> - <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="21a79cb5b7b07eb3936efa97d7903a80d028e820" upstream="master"/> - <project name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="8508ca393d9e12df67740f88b010dbaaaaa7387c" upstream="kirkstone-6.x.y"> - <copyfile dest="export" src="buildconf/export"/> + <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="0ceda8300f359e74364d00c3877a6bd8ec7701eb" upstream="master"/> + <project name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="ffaaac602f33603bfc8e5a1fc88b73fa72c56b14" upstream="master"> + <copyfile dest="export" src="conf/templates/default/export"/> </project> </manifest> diff --git a/tezi/integration.xml b/tezi/integration.xml index b3838b5..f393b98 100644 --- a/tezi/integration.xml +++ b/tezi/integration.xml @@ -8,10 +8,10 @@ <include name="bsp/pinned-ti.xml"/> <include name="bsp/integration-tdx.xml"/> - <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="cf6ffcbad5275a3428f6046468a0c9d572e813d1" upstream="master"/> + <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="b8e1ae8ce6140f6084388842751280b55d55988b" upstream="master"/> <!-- meta-toradex-distro is used for bumpSRCREV --> <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="master"/> - <project name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="kirkstone-6.x.y"> - <copyfile dest="export" src="buildconf/export"/> + <project name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="master"> + <copyfile dest="export" src="conf/templates/default/export"/> </project> </manifest> diff --git a/tezi/next.xml b/tezi/next.xml index 0edb47f..e978c01 100644 --- a/tezi/next.xml +++ b/tezi/next.xml @@ -11,7 +11,7 @@ <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="master"/> <!-- meta-toradex-distro is used for bumpSRCREV --> <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="master"/> - <project name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="kirkstone-6.x.y"> - <copyfile dest="export" src="buildconf/export"/> + <project name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="master"> + <copyfile dest="export" src="conf/templates/default/export"/> </project> </manifest> diff --git a/torizoncore/integration.xml b/torizoncore/integration.xml index 0f9e5d5..92ab24b 100644 --- a/torizoncore/integration.xml +++ b/torizoncore/integration.xml @@ -9,12 +9,12 @@ <remote alias="repo" fetch="https://github.com/toradex" name="toradex"/> <remote alias="repo" fetch="https://github.com/torizon" name="torizon"/> - <project name="meta-security" path="layers/meta-security" remote="yocto" revision="7eed4a60f594a1a90906acf3b3416d16c53bc72a"/> - <project name="meta-updater" path="layers/meta-updater" remote="uptane" revision="395624cf908078cbaa725aef44d1c1bc94d17218"/> - <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="31954471605ae3b41627a0ab7b0dcfe8c5851bd7"/> + <project name="meta-security" path="layers/meta-security" remote="yocto" revision="283a773f24cedacb45def943a455bc3607f8a7a1"/> + <project name="meta-updater" path="layers/meta-updater" remote="uptane" revision="0aa08f395e2b964a40f3acf374676405db1154b0"/> + <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="7a3b0b7ae1ac1a721369ee3f7a73b40b73510099"/> <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="master"/> <project name="meta-toradex-security" path="layers/meta-toradex-security" remote="toradex" revision="main"/> <project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="torizon" revision="master"> <linkfile dest="setup-environment" src="scripts/setup-environment"/> </project> -</manifest> +</manifest>
\ No newline at end of file |