diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2023-07-25 12:22:59 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2023-09-25 06:21:12 -0300 |
| commit | ea8f2ac334494deeebaf90964fecd9967ad156b0 (patch) | |
| tree | d9b90f5d1213b81dfd57209c2d4068e59415475d | |
| parent | 96d49f2d5c0958a2725426de8533c8caf8901e0e (diff) | |
tezi: checkout master branch if available
In the tezi manifest we still have some layers checking out kirkstone,
even if the layers would have a master branch.
Change to master.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | tezi/default.xml | 4 | ||||
| -rw-r--r-- | tezi/integration.xml | 4 | ||||
| -rw-r--r-- | tezi/next.xml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tezi/default.xml b/tezi/default.xml index d19cdab..2615487 100644 --- a/tezi/default.xml +++ b/tezi/default.xml @@ -8,9 +8,9 @@ <include name="bsp/pinned-ti.xml"/> <include name="bsp/pinned-tdx.xml"/> - <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="aec1934cb2708236c033f2d205d5c3fbbebf7555" upstream="kirkstone"/> + <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="cf6ffcbad5275a3428f6046468a0c9d572e813d1" upstream="master"/> <!-- meta-toradex-distro is used for bumpSRCREV --> - <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="fc76e870b03b4920790560eeafd268af36f4d1e9" upstream="kirkstone-6.x.y"/> + <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> diff --git a/tezi/integration.xml b/tezi/integration.xml index fa94db0..b3838b5 100644 --- a/tezi/integration.xml +++ b/tezi/integration.xml @@ -8,9 +8,9 @@ <include name="bsp/pinned-ti.xml"/> <include name="bsp/integration-tdx.xml"/> - <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="aec1934cb2708236c033f2d205d5c3fbbebf7555" upstream="kirkstone"/> + <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="cf6ffcbad5275a3428f6046468a0c9d572e813d1" upstream="master"/> <!-- meta-toradex-distro is used for bumpSRCREV --> - <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="kirkstone-6.x.y"/> + <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> diff --git a/tezi/next.xml b/tezi/next.xml index 7a8da75..0edb47f 100644 --- a/tezi/next.xml +++ b/tezi/next.xml @@ -8,9 +8,9 @@ <include name="bsp/integration-ti.xml"/> <include name="bsp/integration-tdx.xml"/> - <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="kirkstone"/> + <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="kirkstone-6.x.y"/> + <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> |