chore: kas: clean up tegra-{jetpack5/jetpack6}

Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <[email protected]>
TheYoctoJester · Aug 1, 2024 · 49b2281 · 49b2281
1 parent 3a6976d
commit 49b2281
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 25 deletions.
diff --git a/kas/demos/qemuarm64-client-only.yml b/kas/demos/qemuarm64-client-only.yml
@@ -1,5 +1,5 @@
 header:
-  version: 11
+  version: 14
   includes:
   - kas/include/mender-base.yml
 

diff --git a/kas/demos/raspberrypi4-64-app-updates.yml b/kas/demos/raspberrypi4-64-app-updates.yml
@@ -1,5 +1,5 @@
 header:
-  version: 11
+  version: 14
   includes:
   - kas/raspberrypi4-64.yml
 

diff --git a/kas/include/tegra-base.yml b/kas/include/tegra-base.yml
@@ -1,7 +1,10 @@
 header:
-  version: 11
+  version: 14
 
 repos:
+  meta-mender:
+    commit: 872219dfd87113345073160367edc33471795a3b # this one fixes the persistent-id for now!
+
   meta-tegra:
     url: https://github.com/OE4T/meta-tegra.git
   meta-tegra-community:
@@ -21,6 +24,7 @@ repos:
 
   meta-virtualization:
     url: https://git.yoctoproject.org/meta-virtualization.git
+    commit: 6a80f140e387621f62964209a2e07d3bcfb125ce
 
 distro: tegrademo
 
@@ -29,4 +33,10 @@ local_conf_header:
     # these two classes only work as intended when being inherited in the
     # OE4t setup-env.sh style environment, as they modify bblayers.conf
     # and expect additional information on the host.
-    INHERIT:remove = "tegra-support-sanity distro_layer_buildinfo" 
+    INHERIT:remove = "tegra-support-sanity distro_layer_buildinfo" 
+    INHERIT += "tegra-mender-setup"
+    MENDER_FEATURES_ENABLE:append = " mender-growfs-data"
+    MENDER_FEATURES_DISABLE:append = " mender-uboot"
+    IMAGE_FSTYPES:tegra = "tegraflash mender dataimg"
+    IMAGE_FSTYPES:pn-tegra-minimal-initramfs:tegra = "${INITRAMFS_FSTYPES}"
+    IMAGE_FSTYPES:pn-tegra-initrd-flash-initramfs:tegra = "${TEGRA_INITRD_FLASH_INITRAMFS_FSTYPES}"
diff --git a/kas/include/tegra-jetpack5.yml b/kas/include/tegra-jetpack5.yml
@@ -1,28 +1,19 @@
 header:
-  version: 11
+  version: 14
   includes:
   - kas/include/tegra-base.yml
 
 repos:
   meta-tegra:
-    refspec: 972488415a80afebbd652a983a46c2641eed99ad
+    # refers to the scarthgap-l4t-r35.x branch
+    commit: 972488415a80afebbd652a983a46c2641eed99ad
   meta-tegra-community:
-    refspec: 865561b6d3ba6607a814354c122c91422df720d5
+    # refers to the scarthgap-l4t-r35.x branch
+    commit: 865561b6d3ba6607a814354c122c91422df720d5
   meta-tegrademo:
-    refspec: 2d9319ba0c24fb46937a742d78fc046983edb325
-
-  meta-virtualization:
-    refspec: 6a80f140e387621f62964209a2e07d3bcfb125ce
+    # refers to the scarthgap-l4t-r35.x branch
+    commit: 2d9319ba0c24fb46937a742d78fc046983edb325
 
   meta-mender-community:
     layers:
       meta-mender-tegra/meta-mender-tegra-jetpack5:
-
-local_conf_header:
-  tegra-jetpack5: |
-    INHERIT += "tegra-mender-setup"
-    MENDER_FEATURES_ENABLE:append = " mender-growfs-data"
-    MENDER_FEATURES_DISABLE:append = " mender-uboot"
-    IMAGE_FSTYPES:tegra = "tegraflash mender dataimg"
-    IMAGE_FSTYPES:pn-tegra-minimal-initramfs:tegra = "${INITRAMFS_FSTYPES}"
-    IMAGE_FSTYPES:pn-tegra-initrd-flash-initramfs:tegra = "${TEGRA_INITRD_FLASH_INITRAMFS_FSTYPES}"
diff --git a/kas/include/tegra-jetpack6.yml b/kas/include/tegra-jetpack6.yml
@@ -0,0 +1,19 @@
+header:
+  version: 14
+  includes:
+  - kas/include/tegra-base.yml
+
+repos:
+  meta-tegra:
+    # refers to the scarthgap branch
+    commit: b20cff753ff0ffc24121cb35d2e2d218c2d26cf3
+  meta-tegra-community:
+    # refers to the scarthgap branch
+    commit: 68f0520b73312ecc6767252de569679c374afc73
+  meta-tegrademo:
+    # refers to the scarthgap branch
+    commit: 7d54c8f932b9527255e9b871b662beaafca7fa7b
+
+  meta-mender-community:
+    layers:
+      meta-mender-tegra/meta-mender-tegra-jetpack5:
diff --git a/kas/jetson-agx-orin-devkit.yml b/kas/jetson-agx-orin-devkit.yml
@@ -1,8 +1,8 @@
 header:
-  version: 11
+  version: 14
   includes:
   - kas/include/mender-full.yml
-  - kas/include/tegra-jetpack5.yml
+  - kas/include/tegra-jetpack6.yml
 
 machine: jetson-agx-orin-devkit
 

diff --git a/kas/jetson-agx-xavier-devkit.yml b/kas/jetson-agx-xavier-devkit.yml
@@ -1,5 +1,5 @@
 header:
-  version: 11
+  version: 14
   includes:
   - kas/include/mender-full.yml
   - kas/include/tegra-jetpack5.yml

diff --git a/kas/jetson-orin-nano-devkit.yml b/kas/jetson-orin-nano-devkit.yml
@@ -1,8 +1,8 @@
 header:
-  version: 11
+  version: 14
   includes:
     - kas/include/mender-full.yml
-    - kas/include/tegra-jetpack5.yml
+    - kas/include/tegra-jetpack6.yml
 
 machine: jetson-orin-nano-devkit