diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-09-17 14:23:51 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-09-17 14:23:51 +0200 |
commit | c788dc94b1cd97634c58a27fe669c5d68e80f561 (patch) | |
tree | a8be68836e50534b28169c12107862abfbe3233c | |
parent | 9fff1a682c1cb15bfacdf8dd6ee0813b680b11be (diff) |
use the dunfell branches of the tdx bsp
The BSP created the dunfell-5.x.y branches at HEAD of current master.
Reflect that in the manifest.
While at it set the hashes to current HEAD for the BSP layers.
Related-to: ELB-2812
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Change-Id: I251919cec7c1367d224b47b3f34abbc124deae31
-rw-r--r-- | bsp/integration-tdx.xml | 6 | ||||
-rw-r--r-- | bsp/pinned-tdx.xml | 6 | ||||
-rw-r--r-- | tdxref/default.xml | 4 | ||||
-rw-r--r-- | tdxref/integration.xml | 2 | ||||
-rw-r--r-- | tdxref/next.xml | 2 | ||||
-rw-r--r-- | torizoncore/default.xml | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/bsp/integration-tdx.xml b/bsp/integration-tdx.xml index 6f63c53..b975e65 100644 --- a/bsp/integration-tdx.xml +++ b/bsp/integration-tdx.xml @@ -2,7 +2,7 @@ <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="master"/> - <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="master"/> - <project name="meta-toradex-tegra.git" path="layers/meta-toradex-tegra" remote="tdx" revision="master"/> + <project name="meta-toradex-bsp-common.git" path="layers/meta-toradex-bsp-common" remote="tdx" revision="dunfell-5.x.y"/> + <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="dunfell-5.x.y"/> + <project name="meta-toradex-tegra.git" path="layers/meta-toradex-tegra" remote="tdx" revision="dunfell-5.x.y"/> </manifest> diff --git a/bsp/pinned-tdx.xml b/bsp/pinned-tdx.xml index 17f955e..31e7186 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="9de495e99756b66fc2a5d5599a26339fcca5cc53" upstream="master"/> - <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="38de7a3c6dc8e32722b3007755d82e90c9fea416" upstream="master"/> - <project name="meta-toradex-tegra.git" path="layers/meta-toradex-tegra" remote="tdx" revision="1048e531e0eb3a8162a9c77f03563d0858d3dbed" upstream="master"/> + <project name="meta-toradex-bsp-common.git" path="layers/meta-toradex-bsp-common" remote="tdx" revision="588e17d17a72c1cc9457da2848fba2d805c4b2ea" upstream="dunfell-5.x.y"/> + <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="bbdecb1ea9ecc59b8777de9566fec45e0c99097b" upstream="dunfell-5.x.y"/> + <project name="meta-toradex-tegra.git" path="layers/meta-toradex-tegra" remote="tdx" revision="1048e531e0eb3a8162a9c77f03563d0858d3dbed" upstream="dunfell-5.x.y"/> </manifest>
\ No newline at end of file diff --git a/tdxref/default.xml b/tdxref/default.xml index a53a048..0444cff 100644 --- a/tdxref/default.xml +++ b/tdxref/default.xml @@ -7,8 +7,8 @@ <include name="bsp/pinned-tdx.xml"/> <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="0e7015f7a86dda995a39662edbb5c26da647c496" upstream="dunfell"/> - <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="93c179932a1a282bb56823ee202e387ced41f388" upstream="master"/> - <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="e3c9f089b2dd3b807d97dec80fa15a5d13f86cea" upstream="dunfell-5.x.y"> + <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="93c179932a1a282bb56823ee202e387ced41f388" upstream="dunfell-5.x.y"/> + <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="1e0d10b2851ac455618ab7e4c7db86c9ad1227a0" 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 07da3aa..201d3e4 100644 --- a/tdxref/integration.xml +++ b/tdxref/integration.xml @@ -7,7 +7,7 @@ <include name="bsp/integration-tdx.xml" /> <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="0e7015f7a86dda995a39662edbb5c26da647c496" upstream="dunfell"/> - <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="master"/> + <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"/> </project> diff --git a/tdxref/next.xml b/tdxref/next.xml index d9ed208..92ec1a5 100644 --- a/tdxref/next.xml +++ b/tdxref/next.xml @@ -7,7 +7,7 @@ <include name="bsp/integration-tdx.xml" /> <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="master"/> + <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"/> </project> diff --git a/torizoncore/default.xml b/torizoncore/default.xml index 7eafbc9..a312407 100644 --- a/torizoncore/default.xml +++ b/torizoncore/default.xml @@ -12,7 +12,7 @@ <project name="meta-security" path="layers/meta-security" remote="yocto" revision="982a29bbb7ef32475aea7c4bb56c620065a50927"/> <project name="meta-updater" path="layers/meta-updater" remote="ats" revision="af3b1dbd6cef901a2a0db8686231b037758d4c86"/> <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="ff997b6b3ba800978546098ab3cdaa113b6695e1"/> - <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="880a6d5687cc8fe685240300811a1ddf90b192a4"/> + <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="1e0d10b2851ac455618ab7e4c7db86c9ad1227a0"/> <project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="toradex-torizon" revision="8042c48bc9199f0c9d2582328bf0cbfce62aa8b9"> <linkfile dest="setup-environment" src="scripts/setup-environment"/> </project> |