0.23.0 release

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "avocado-cli"
-version = "0.22.1"
+version = "0.23.0"
 edition = "2021"
 description = "Command line interface for Avocado."
 authors = ["Avocado"]
@@ -19,7 +19,6 @@ path = "src/lib.rs"
 
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
-toml = "0.9"
 serde_yaml = "0.9"
 anyhow = "1.0"
 clap = { version = "4.0", features = ["derive"] }

configs/advantech/icam-540.yaml

@@ -5,32 +5,35 @@ src_dir: ../../
 distro:
   channel: apollo-edge
   version: 0.1.0
-runtime:
+runtimes:
   dev:
-    dependencies:
+    extensions:
+      - avocado-ext-dev
+      - avocado-bsp-{{ avocado.target }}
+      - config
+      - app
+    packages:
       avocado-img-bootfiles: '*'
       avocado-img-rootfs: '*'
       avocado-img-initramfs: '*'
-      avocado-ext-dev:
-        ext: avocado-ext-dev
-        vsn: "*"
-      avocado-bsp:
-          ext: avocado-bsp-{{ avocado.target }}
-          vsn: "*"
-      config:
-        ext: config
-      app:
-        ext: app
     icam-540:
-      dependencies:
+      packages:
         avocado-img-tegraflash: '*'
-ext:
+extensions:
+  avocado-ext-dev:
+    source:
+      type: package
+      version: '*'
+  avocado-bsp-{{ avocado.target }}:
+    source:
+      type: package
+      version: '*'
   app:
     types:
     - sysext
     - confext
     version: 0.1.0
-    dependencies:
+    packages:
       i2c-tools: '*'
       pylon: '*'
       pylon-dev: '*'
@@ -58,11 +61,11 @@ ext:
         password: ''
 sdk:
   image: docker.io/avocadolinux/sdk:{{ config.distro.channel }}
-  dependencies:
+  packages:
     avocado-sdk-toolchain: "{{ config.distro.version }}"
     nativesdk-avocado-ext-dev: "*"
   icam-540:
-    dependencies:
+    packages:
       nativesdk-util-linux-mount: '*'
     container_args:
     - --network=host
@@ -71,7 +74,7 @@ sdk:
     - -v
     - /sys:/sys:ro
     - --privileged
-provision:
+provision_profiles:
   tegraflash:
     container_args:
     - -v

configs/default.yaml

@@ -16,31 +16,39 @@ distro:
 ## Runtimes
 ##
 
-runtime:
+runtimes:
   dev:
-    dependencies:
+    extensions:
+      - avocado-ext-dev
+      - avocado-ext-sshd-dev
+      - avocado-bsp-{{ avocado.target }}
+      - config
+      - app
+    packages:
       avocado-img-bootfiles: "*"
       avocado-img-rootfs: "*"
       avocado-img-initramfs: "*"
-      avocado-ext-dev:
-        ext: avocado-ext-dev
-        vsn: "*"
-      avocado-ext-sshd-dev:
-        ext: avocado-ext-sshd-dev
-        vsn: "*"
-      avocado-bsp:
-        ext: avocado-bsp-{{ avocado.target }}
-        vsn: "*"
-      config:
-        ext: config
-      app:
-        ext: app
 
 ##
 ## Extensions
 ##
 
-ext:
+extensions:
+  avocado-ext-dev:
+    source:
+      type: package
+      version: "*"
+
+  avocado-ext-sshd-dev:
+    source:
+      type: package
+      version: "*"
+
+  avocado-bsp-{{ avocado.target }}:
+    source:
+      type: package
+      version: "*"
+
   # Generated default app extension
   # Use or modify this to install dependencies and or include sdk compiled code
   app:
@@ -50,7 +58,7 @@ ext:
     version: "0.1.0"
 
   # Install application dependencies
-    # dependencies:
+    # packages:
 #curl = "*"
 #iperf3 = "*"
 
@@ -74,7 +82,7 @@ ext:
 sdk:
   image: "docker.io/avocadolinux/sdk:{{ config.distro.channel }}"
 
-  dependencies:
+  packages:
     avocado-sdk-toolchain: "{{ config.distro.version }}"
     nativesdk-avocado-ext-dev: "*"
 
@@ -89,7 +97,7 @@ sdk:
 # When provisioning using usb or sd provisioning profiles, set extra sdk
 # container arguments to allow access to these devices
 
-provision:
+provision_profiles:
   usb:
     container_args:
       - -v

configs/nvidia/jetson-orin-nano-devkit.yaml

@@ -4,29 +4,30 @@ supported_targets:
 distro:
   channel: apollo-edge
   version: 0.1.0
-runtime:
+runtimes:
   dev:
-    dependencies:
+    extensions:
+      - avocado-bsp-{{ avocado.target }}
+      - config
+      - app
+    packages:
       avocado-img-bootfiles: '*'
       avocado-img-rootfs: '*'
       avocado-img-initramfs: '*'
-      avocado-bsp:
-        ext: avocado-bsp-{{ avocado.target }}
-        vsn: "*"
-      config:
-        ext: config
-      app:
-        ext: app
     jetson-orin-nano-devkit:
-      dependencies:
+      packages:
         avocado-img-tegraflash: '*'
-ext:
+extensions:
+  avocado-bsp-{{ avocado.target }}:
+    source:
+      type: package
+      version: '*'
   app:
     types:
     - sysext
     - confext
     version: 0.1.0
-    dependencies: {}
+    packages: {}
   config:
     types:
     - confext
@@ -36,7 +37,7 @@ ext:
         password: ''
 sdk:
   image: docker.io/avocadolinux/sdk:{{ config.distro.channel }}
-  dependencies:
+  packages:
     avocado-sdk-toolchain: "{{ config.distro.version }}"
     nativesdk-avocado-ext-dev: "*"
   jetson-orin-nano-devkit:
@@ -47,9 +48,9 @@ sdk:
     - -v
     - /sys:/sys:ro
     - --privileged
-    dependencies:
+    packages:
       nativesdk-util-linux-mount: '*'
-provision:
+provision_profiles:
   tegraflash:
     container_args:
     - -v

configs/raspberry-pi/raspberrypi-4-model-b.yaml

@@ -4,32 +4,37 @@ supported_targets:
 distro:
   channel: apollo-edge
   version: 0.1.0
-runtime:
+runtimes:
   dev:
-    dependencies:
+    extensions:
+      - avocado-ext-dev
+      - avocado-ext-sshd-dev
+      - avocado-bsp-{{ avocado.target }}
+      - config
+      - app
+    packages:
       avocado-img-bootfiles: '*'
       avocado-img-rootfs: '*'
       avocado-img-initramfs: '*'
-      avocado-ext-dev:
-        ext: avocado-ext-dev
-        vsn: '*'
-      avocado-ext-sshd-dev:
-        ext: avocado-ext-sshd-dev
-        vsn: '*'
-      avocado-bsp:
-        ext: avocado-bsp-{{ avocado.target }}
-        vsn: "*"
-      config:
-        ext: config
-      app:
-        ext: app
-ext:
+extensions:
+  avocado-ext-dev:
+    source:
+      type: package
+      version: '*'
+  avocado-ext-sshd-dev:
+    source:
+      type: package
+      version: '*'
+  avocado-bsp-{{ avocado.target }}:
+    source:
+      type: package
+      version: '*'
   app:
     types:
     - sysext
     - confext
     version: 0.1.0
-    dependencies: {}
+    packages: {}
   config:
     types:
     - confext
@@ -39,13 +44,13 @@ ext:
         password: ''
 sdk:
   image: docker.io/avocadolinux/sdk:{{ config.distro.channel }}
-  dependencies:
+  packages:
     avocado-sdk-toolchain: "{{ config.distro.version }}"
     nativesdk-avocado-ext-dev: "*"
   raspberrypi4:
     container_args:
     - --network=host
-provision:
+provision_profiles:
   img:
     container_args:
     - -v