summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Schenker <philippe.schenker@toradex.com>2022-08-31 19:27:39 +0200
committerPhilippe Schenker <philippe.schenker@toradex.com>2022-08-31 19:40:55 +0200
commit14b335f5b03ff1dad448952572843fc9552f0535 (patch)
treefc227046183468e38535fdd5384191c750bcf7ab
parent3a5d7c772baed495ee975d48aed61c997382e14c (diff)
use kirkstone-6.x.y for toradex layers
Use kirkstone-6.x.y for all meta-toradex-* layers as the branches now got created. While at it also bump the hashes of these layers to the latest hash. Related-to: ELB-4618 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
-rw-r--r--bsp/integration-tdx.xml4
-rw-r--r--bsp/pinned-tdx.xml4
-rw-r--r--tdxref/default.xml4
-rw-r--r--tdxref/integration.xml4
-rw-r--r--tdxref/next.xml4
-rw-r--r--torizoncore/default.xml2
-rw-r--r--torizoncore/integration.xml2
-rw-r--r--torizoncore/next.xml2
8 files changed, 13 insertions, 13 deletions
diff --git a/bsp/integration-tdx.xml b/bsp/integration-tdx.xml
index aa6a3a8..f2a6826 100644
--- a/bsp/integration-tdx.xml
+++ b/bsp/integration-tdx.xml
@@ -2,6 +2,6 @@
<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-bsp-common.git" path="layers/meta-toradex-bsp-common" remote="tdx" revision="kirkstone-6.x.y"/>
+ <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="kirkstone-6.x.y"/>
</manifest>
diff --git a/bsp/pinned-tdx.xml b/bsp/pinned-tdx.xml
index 7c0eed1..76b2f76 100644
--- a/bsp/pinned-tdx.xml
+++ b/bsp/pinned-tdx.xml
@@ -1,6 +1,6 @@
<?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="4744d2e28fab596554a57aaa888485c20b204d29" upstream="master"/>
- <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="97eebca39d33227e784020198908009f36f8cb93" upstream="master"/>
+ <project name="meta-toradex-bsp-common.git" path="layers/meta-toradex-bsp-common" remote="tdx" revision="ac0cf193804c32ec93291f193fe36c04aa649084" upstream="kirkstone-6.x.y"/>
+ <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="aed3c9b8e2a89703e3982d52e86c7d754021e489" upstream="kirkstone-6.x.y"/>
</manifest>
diff --git a/tdxref/default.xml b/tdxref/default.xml
index 179b7f6..0d730a7 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="5b71df60e523423b9df6793de9387f87a149ac42" upstream="kirkstone"/>
- <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="86a1a443fd424ebde3405934e01a238936b7c84c" upstream="master"/>
- <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="bf27aa8e615476a525f07605bdd027faf8a76e02" upstream="master">
+ <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="e8a4b5e7d775dc916cd8d43e71b56932195d0c34" upstream="kirkstone-6.x.y"/>
+ <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="2d89226a37d252392f19c6718dd9451f364ccf5c" upstream="kirkstone-6.x.y">
<copyfile dest="export" src="buildconf/export"/>
</project>
</manifest>
diff --git a/tdxref/integration.xml b/tdxref/integration.xml
index d692e11..df49f27 100644
--- a/tdxref/integration.xml
+++ b/tdxref/integration.xml
@@ -7,8 +7,8 @@
<include name="bsp/integration-tdx.xml"/>
<project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="5b71df60e523423b9df6793de9387f87a149ac42" upstream="kirkstone"/>
- <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">
+ <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="kirkstone-6.x.y"/>
+ <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="kirkstone-6.x.y">
<copyfile dest="export" src="buildconf/export"/>
</project>
</manifest> \ No newline at end of file
diff --git a/tdxref/next.xml b/tdxref/next.xml
index ec00062..56c785d 100644
--- a/tdxref/next.xml
+++ b/tdxref/next.xml
@@ -7,8 +7,8 @@
<include name="bsp/integration-tdx.xml" />
<project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="kirkstone"/>
- <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">
+ <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="kirkstone-6.x.y"/>
+ <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="kirkstone-6.x.y">
<copyfile dest="export" src="buildconf/export"/>
</project>
</manifest>
diff --git a/torizoncore/default.xml b/torizoncore/default.xml
index 81843f5..8351f6e 100644
--- a/torizoncore/default.xml
+++ b/torizoncore/default.xml
@@ -10,7 +10,7 @@
<project name="meta-security" path="layers/meta-security" remote="yocto" revision="d3d8e62bf1caa3870a504c0addcfd200b33c189f"/>
<project name="meta-updater" path="layers/meta-updater" remote="uptane" revision="03fc4eb32bccc43f6aa386408dad30205efa5b8e"/>
<project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="33fb354402b8875602a5746c1ad58528c8757c47"/>
- <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="f4057a174e2f20df54320cf1ad9a5f4317ad599d"/>
+ <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="2d89226a37d252392f19c6718dd9451f364ccf5c"/>
<project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="toradex-torizon" revision="33f718a85828ba4806ab97ad729711da5a6011f1">
<linkfile dest="setup-environment" src="scripts/setup-environment"/>
</project>
diff --git a/torizoncore/integration.xml b/torizoncore/integration.xml
index b67ec3d..1461be0 100644
--- a/torizoncore/integration.xml
+++ b/torizoncore/integration.xml
@@ -10,7 +10,7 @@
<project name="meta-security" path="layers/meta-security" remote="yocto" revision="c79262a30bd385f5dbb009ef8704a1a01644528e"/>
<project name="meta-updater" path="layers/meta-updater" remote="uptane" revision="03fc4eb32bccc43f6aa386408dad30205efa5b8e"/>
<project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="26a361a39ff5ab6fae22efbdc582f84d13330ba2"/>
- <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="master"/>
+ <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="kirkstone-6.x.y"/>
<project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="toradex-torizon" revision="kirkstone-6.x.y">
<linkfile dest="setup-environment" src="scripts/setup-environment"/>
</project>
diff --git a/torizoncore/next.xml b/torizoncore/next.xml
index 9cc277e..8bdc992 100644
--- a/torizoncore/next.xml
+++ b/torizoncore/next.xml
@@ -10,7 +10,7 @@
<project name="meta-security" path="layers/meta-security" remote="yocto" revision="kirkstone"/>
<project name="meta-updater" path="layers/meta-updater" remote="uptane" revision="kirkstone"/>
<project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="kirkstone"/>
- <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="master"/>
+ <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="kirkstone-6.x.y"/>
<project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="toradex-torizon" revision="kirkstone-6.x.y">
<linkfile dest="setup-environment" src="scripts/setup-environment"/>
</project>