rel/0.41.0 → main

.gitignore

@@ -2,6 +2,9 @@
 /target/
 **/*.rs.bk
 
+# Transient cross-compile config written by avocado-cli-compile.sh during `ext package`
+/.cargo/
+
 # Cargo lock file (uncomment if this is a library)
 # Cargo.lock
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "avocado-cli"
-version = "0.40.2"
+version = "0.41.0"
 edition = "2021"
 description = "Command line interface for Avocado."
 authors = ["Avocado"]

avocado-cli-clean.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+echo "Cleaning avocado-cli build artifacts"
+
+cd "$(dirname "$0")"
+
+# Remove Cargo build artifacts
+cargo clean
+
+# Remove any generated config
+rm -rf .cargo
+
+echo "Clean complete"

avocado-cli-compile.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+set -e
+
+# Find the Rust target from RUST_TARGET_PATH
+for json_file in "$RUST_TARGET_PATH"/*.json; do
+    if [ -f "$json_file" ]; then
+        json_name=$(basename "$json_file" .json)
+        if [[ "$json_name" == "${OECORE_TARGET_ARCH}-"* ]]; then
+            RUST_TARGET="$json_name"
+            break
+        fi
+    fi
+done
+
+if [ -z "$RUST_TARGET" ]; then
+    echo "Error: Could not find Rust target for $OECORE_TARGET_ARCH"
+    exit 1
+fi
+
+echo "Building avocado-cli for target: $RUST_TARGET"
+
+cd "$(dirname "$0")"
+
+# Clear any rustflags that might cause conflicts with our .cargo/config.toml.
+# The SDK env exports CARGO_TARGET_<triple>_RUSTFLAGS carrying its own --sysroot;
+# left set, cargo merges it with the config below and rustc gets --sysroot twice
+# ("Option 'sysroot' given more than once"). Unset every target's flavor, not just
+# one hardcoded triple, so this works for x86_64 and aarch64 targets alike.
+unset RUSTFLAGS
+unset CARGO_BUILD_RUSTFLAGS
+for var in $(env | grep -o 'CARGO_TARGET_[A-Z0-9_]*_RUSTFLAGS'); do
+    unset "$var"
+done
+
+# Remove any existing config that might conflict
+rm -rf .cargo
+
+# Create config.toml with cross-compilation settings
+mkdir -p .cargo
+cat > .cargo/config.toml << EOF
+[target.$RUST_TARGET]
+rustflags = ["--sysroot=$SDKTARGETSYSROOT/usr", "-C", "link-arg=--sysroot=$SDKTARGETSYSROOT"]
+EOF
+
+cargo build --release --target "$RUST_TARGET"

avocado-cli-install.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+# Find the Rust target from RUST_TARGET_PATH
+for json_file in "$RUST_TARGET_PATH"/*.json; do
+    if [ -f "$json_file" ]; then
+        json_name=$(basename "$json_file" .json)
+        if [[ "$json_name" == "${OECORE_TARGET_ARCH}-"* ]]; then
+            RUST_TARGET="$json_name"
+            break
+        fi
+    fi
+done
+
+BINARY_PATH="$(dirname "$0")/target/$RUST_TARGET/release/avocado"
+
+if [ ! -f "$BINARY_PATH" ]; then
+    echo "Error: Binary not found at $BINARY_PATH"
+    exit 1
+fi
+
+install -D -m 755 "$BINARY_PATH" "$AVOCADO_BUILD_EXT_SYSROOT/usr/bin/avocado"
+echo "Installed: $(file "$AVOCADO_BUILD_EXT_SYSROOT/usr/bin/avocado")"

avocado.yaml

@@ -0,0 +1,52 @@
+supported_targets: '*'
+
+extensions:
+  avocado-ext-cli:
+    # Version is injected at build time: `AVOCADO_EXT_VERSION=<x> avocado ext package …`
+    # (CI sets it from the release/tag; unset => empty + a warning).
+    version: '{{ env.AVOCADO_EXT_VERSION }}'
+    release: r0
+    summary: Avocado build system command line interface
+    description: Avocado build system command line interface for managing the system
+    license: Apache-2.0
+    url: https://github.com/avocadolinux/avocado-cli
+    vendor: Avocado Linux <info@avocadolinux.org>
+    # Stage the Rust source (the repo root IS the project) plus the packaging
+    # artifacts, so `ext package` can compile it. configs/ is required:
+    # src references include_str!("../../configs/default.yaml").
+    package_files:
+      - avocado.yaml
+      - avocado-cli-*.sh
+      - Cargo.toml
+      - Cargo.lock
+      - build.rs
+      - src
+      - configs
+
+    packages:
+      bash: '*'
+      avocado-cli-bin:
+        compile: avocado-cli-compile
+        install: avocado-cli-install.sh
+
+    sdk:
+      packages:
+        nativesdk-binutils: '*'
+        nativesdk-cargo: '*'
+        nativesdk-gcc: '*'
+        nativesdk-glibc-dev: '*'
+        nativesdk-libgcc-dev: '*'
+        nativesdk-rust: '*'
+        nativesdk-git: '*'
+        packagegroup-rust-cross-canadian-avocado-{{ avocado.target }}: '*'
+
+sdk:
+  image: docker.io/avocadolinux/sdk:{{ env.AVOCADO_DISTRO_RELEASE }}-{{ env.AVOCADO_DISTRO_CHANNEL }}
+
+  compile:
+    avocado-cli-compile:
+      compile: avocado-cli-compile.sh
+      clean: avocado-cli-clean.sh
+      packages:
+        libstd-rs: '*'
+        libstd-rs-dev: '*'

configs/default.yaml

@@ -1,4 +1,4 @@
-cli_requirement: ">=0.26.0"
+cli_requirement: ">=0.41.0"
 
 default_target: "{target}"
 
@@ -24,7 +24,6 @@ runtimes:
       - avocado-ext-dev
       - avocado-ext-sshd-dev
       - avocado-bsp-{{ avocado.target.board }}
-      - config
       - app
     packages:
       avocado-runtime: "*"
@@ -62,15 +61,26 @@ extensions:
       #curl: "*"
       #iperf3: "*"
 
-  # Generated default config extension
-  # Use or modify this to configure "real" user accounts (passwd, shadow, group)
-  # or configure other system services
-  config:
-    types:
-      - confext
-    version: "0.1.0"
+##
+## Images
+##
+
+rootfs:
+  permissions: dev
 
-    # NOT FOR PRODUCTION: Set root password to empty string
+initramfs:
+  permissions: dev
+
+##
+## Permissions
+##
+
+# NOT FOR PRODUCTION: the `dev` profile sets an empty root password and is
+# referenced by rootfs/initramfs above. Define additional profiles with real
+# users, groups, and hashed passwords, then point rootfs/initramfs at them via
+# `permissions: <name>`.
+permissions:
+  dev:
     users:
       root:
         password: ""
@@ -80,7 +90,7 @@ extensions:
 ##
 
 sdk:
-  image: "docker.io/avocadolinux/sdk:{{ config.distro.release }}-{{ config.distro.channel }}"
+  image: "docker.io/avocadolinux/sdk:{{ config.distro.release }}"
 
   container_args:
     - --privileged