Merge pull request #393 from TheYoctoJester/oe4t-kirkstone

add the current OE4T state as base for upstreaming Orin support

.github/workflows/build.yml

@@ -98,6 +98,8 @@ jobs:
           - board: qemuarm64-swupdate
             subpath: demos
             experimental: true
+          - board: jetson-agx-orin-devkit
+            experimental: true
 
     runs-on: [self-hosted, linux, x64]
     container:

kas/include/tegra-base.yml

@@ -0,0 +1,32 @@
+header:
+  version: 11
+
+repos:
+  meta-tegra:
+    url: https://github.com/OE4T/meta-tegra.git
+  meta-tegra-community:
+    url: https://github.com/OE4T/meta-tegra-community.git
+  meta-tegrademo:
+    url: https://github.com/OE4T/tegra-demo-distro.git
+    layers:
+      layers/meta-tegra-support:
+      layers/meta-demo-ci:
+      layers/meta-tegrademo:
+
+  meta-openembedded:
+    layers:
+      meta-filesystems:
+      meta-networking:
+      meta-python:
+
+  meta-virtualization:
+    url: https://git.yoctoproject.org/meta-virtualization.git
+
+distro: tegrademo
+
+local_conf_header:
+  tegra: |
+    # 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" 

kas/include/tegra-jetpack4.yml

@@ -0,0 +1,29 @@
+header:
+  version: 11
+  includes:
+  - kas/include/tegra-base.yml
+
+repos:
+  meta-tegra:
+    refspec: kirkstone-l4t-r32.7.x
+    layers:
+      .:
+      contrib:
+  meta-tegra-community:
+    refspec: kirkstone-l4t-r32.7.x
+  meta-tegrademo:
+    refspec: kirkstone-l4t-r32.7.x
+  meta-virtualization:
+    refspec: kirkstone
+
+  meta-mender-community:
+    layers:
+      meta-mender-tegra/meta-mender-tegra-jetpack4:
+
+distro: tegrademo-mender
+
+#local_conf_header:
+#  tegra-jetpack4: |
+#    INHERIT:remove = "tegra-support-sanity distro_layer_buildinfo"
+#    MENDER_FEATURES_ENABLE:append = " mender-growfs-data"
+#    MENDER_FEATURES_DISABLE:append = " mender-uboot"

kas/include/tegra-jetpack5.yml

@@ -0,0 +1,28 @@
+header:
+  version: 11
+  includes:
+  - kas/include/tegra-base.yml
+
+repos:
+  meta-tegra:
+    refspec: 2a808b6afb221974196d2eeab3537140ebb63cc7
+  meta-tegra-community:
+    refspec: f5a9cf859a1414bc7654fc57c09fb7ee1b116194
+  meta-tegrademo:
+    refspec: kirkstone
+
+  meta-virtualization:
+    refspec: b3b3dbc67504e8cd498d6db202ddcf5a9dd26a9d
+
+  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}"

kas/jetson-agx-orin-devkit.yml

@@ -0,0 +1,7 @@
+header:
+  version: 11
+  includes:
+  - kas/include/mender-full.yml
+  - kas/include/tegra-jetpack5.yml
+
+machine: jetson-agx-orin-devkit

kas/jetson-agx-xavier-devkit.yml

@@ -2,6 +2,6 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
-  - kas/include/tegra.yml
+  - kas/include/tegra-jetpack4.yml
 
 machine: jetson-agx-xavier-devkit

kas/jetson-nano-2gb-devkit.yml

@@ -2,6 +2,6 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
-  - kas/include/tegra.yml
+  - kas/include/tegra-jetpack4.yml
 
 machine: jetson-nano-2gb-devkit

kas/jetson-nano-devkit-emmc.yml

@@ -2,6 +2,6 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
-  - kas/include/tegra.yml
+  - kas/include/tegra-jetpack4.yml
 
 machine: jetson-nano-devkit-emmc

kas/jetson-nano-devkit.yml

@@ -2,6 +2,6 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
-  - kas/include/tegra.yml
+  - kas/include/tegra-jetpack4.yml
 
 machine: jetson-nano-devkit

kas/jetson-tx2-devkit-4gb.yml

@@ -2,6 +2,6 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
-  - kas/include/tegra.yml
+  - kas/include/tegra-jetpack4.yml
 
 machine: jetson-tx2-devkit-4gb

kas/jetson-tx2-devkit-tx2i.yml

@@ -2,6 +2,6 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
-  - kas/include/tegra.yml
+  - kas/include/tegra-jetpack4.yml
 
 machine: jetson-tx2-devkit-tx2i

kas/jetson-tx2-devkit.yml

@@ -2,6 +2,6 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
-  - kas/include/tegra.yml
+  - kas/include/tegra-jetpack4.yml
 
 machine: jetson-tx2-devkit

kas/jetson-xavier-nx-devkit-emmc.yml

@@ -2,6 +2,6 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
-  - kas/include/tegra.yml
+  - kas/include/tegra-jetpack4.yml
 
 machine: jetson-xavier-nx-devkit-emmc

kas/jetson-xavier-nx-devkit-tx2-nx.yml

@@ -2,6 +2,6 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
-  - kas/include/tegra.yml
+  - kas/include/tegra-jetpack4.yml
 
 machine: jetson-xavier-nx-devkit-tx2-nx

kas/jetson-xavier-nx-devkit.yml

@@ -2,6 +2,6 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
-  - kas/include/tegra.yml
+  - kas/include/tegra-jetpack4.yml
 
 machine: jetson-xavier-nx-devkit

meta-mender-tegra/README.md → meta-mender-tegra/meta-mender-tegra-jetpack4/README.md

@@ -42,16 +42,16 @@ for the most up to date instructions on starting out with mender and tegra.
 
 The following configuration files for building using the `kas` tool are provided:
 
-- [jetson-agx-xavier-devkit.yml](../kas/jetson-agx-xavier-devkit.yml)
-- [jetson-nano-2gb-devkit.yml](../kas/jetson-nano-2gb-devkit.yml)
-- [jetson-nano-devkit-emmc.yml](../kas/jetson-nano-devkit-emmc.yml)
-- [jetson-nano-devkit.yml](../kas/jetson-nano-devkit.yml)
-- [jetson-tx2-devkit-4gb.yml](../kas/jetson-tx2-devkit-4gb.yml)
-- [jetson-tx2-devkit-tx2i.yml](../kas/jetson-tx2-devkit-tx2i.yml)
-- [jetson-tx2-devkit.yml](../kas/jetson-tx2-devkit.yml)
-- [jetson-xavier-nx-devkit-emmc.yml](../kas/jetson-xavier-nx-devkit-emmc.yml)
-- [jetson-xavier-nx-devkit-tx2-nx.yml](../kas/jetson-xavier-nx-devkit-tx2-nx.yml)
-- [jetson-xavier-nx-devkit.yml](../kas/jetson-xavier-nx-devkit.yml)
+- [jetson-agx-xavier-devkit.yml](../../kas/jetson-agx-xavier-devkit.yml)
+- [jetson-nano-2gb-devkit.yml](../../kas/jetson-nano-2gb-devkit.yml)
+- [jetson-nano-devkit-emmc.yml](../../kas/jetson-nano-devkit-emmc.yml)
+- [jetson-nano-devkit.yml](../../kas/jetson-nano-devkit.yml)
+- [jetson-tx2-devkit-4gb.yml](../../kas/jetson-tx2-devkit-4gb.yml)
+- [jetson-tx2-devkit-tx2i.yml](../../kas/jetson-tx2-devkit-tx2i.yml)
+- [jetson-tx2-devkit.yml](../../kas/jetson-tx2-devkit.yml)
+- [jetson-xavier-nx-devkit-emmc.yml](../../kas/jetson-xavier-nx-devkit-emmc.yml)
+- [jetson-xavier-nx-devkit-tx2-nx.yml](../../kas/jetson-xavier-nx-devkit-tx2-nx.yml)
+- [jetson-xavier-nx-devkit.yml](../../kas/jetson-xavier-nx-devkit.yml)
 
 ## Acknowlegements
 

meta-mender-tegra/meta-mender-tegra-jetpack4/conf/layer.conf

@@ -0,0 +1,12 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+		${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "meta-mender-tegra-jetpack4"
+BBFILE_PATTERN_meta-mender-tegra-jetpack4 = "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-mender-tegra-jetpack4 = "10"
+LAYERVERSION_meta-mender-tegra = "1"
+LAYERSERIES_COMPAT_meta-mender-tegra-jetpack4 = "kirkstone"
+LAYERDEPENDS_meta-mender-tegra-jetpack4 = "tegra"

meta-mender-tegra/meta-mender-tegra-jetpack5/README.md

@@ -0,0 +1,51 @@
+# meta-mender-tegra
+
+Mender integration layer for NVIDIA Tegra hardware.
+
+The supported and tested boards are:
+
+- AGX Orin
+
+Visit the individual board links above for more information on status of the
+integration and more detailed instructions on how to build and use images
+together with Mender for the mentioned boards.
+
+
+## Dependencies
+
+This layer depends on:
+
+```
+URI: https://github.com/madisongh/meta-tegra.git
+layers: meta-tegra
+branch: kirkstone-l4t-r32.7.x
+revision: HEAD
+```
+
+```
+URI: https://github.com/mendersoftware/meta-mender.git
+layers: meta-mender-core
+branch: kirkstone
+revision: HEAD
+```
+
+## Quick start
+
+See the mender hub pages and the documentation for the `tegrademo-mender`
+distro on the [tegra-demo-distro](https://github.com/OE4T/tegra-demo-distro) repository
+for the most up to date instructions on starting out with mender and tegra.
+
+## [`kas`](https://github.com/siemens/kas) configurations
+
+The following configuration files for building using the `kas` tool are provided:
+
+- [jetson-agx-orin-devkit.yml](../../kas/jetson-agx-orin-devkit.yml)
+
+## Acknowlegements
+
+Special thanks to [Matt Madison](https://github.com/madisongh) for his contributions to
+support zeus and later branches and his work on meta-tegra which makes this mender
+integration possible.
+
+Thanks also to [Kurt Keifer](https://github.com/kekiefer/) for his contributions and
+cleanup to support additional platforms and the tegra-demo-distro on the dunfell release.

meta-mender-tegra/meta-mender-tegra-jetpack5/classes/image_types_mender_tegra.bbclass

@@ -0,0 +1,4 @@
+inherit image_types_tegra
+
+DATAFILE ?= "${IMAGE_BASENAME}-${MACHINE}.dataimg"
+IMAGE_TEGRAFLASH_DATA ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.dataimg"