vcontainer: add SDK-based standalone tarball

Add vcontainer-tarball.bb recipe that creates a relocatable standalone
distribution of vdkr and vpdmn container tools using Yocto SDK infrastructure.

Features:
- Auto-detects available architectures from built blobs
- Custom SDK installer with vcontainer-specific messages
- nativesdk-qemu-vcontainer.bb: minimal QEMU without OpenGL deps

Recipe changes:
- DELETE vdkr-native_1.0.bb (functionality moved to SDK)
- DELETE vpdmn-native_1.0.bb (functionality moved to SDK)
- ADD vcontainer-tarball.bb (SDK tarball recipe)
- ADD toolchain-shar-extract.sh (SDK installer template)
- ADD nativesdk-qemu-vcontainer.bb (minimal QEMU for SDK)

Usage:
  MACHINE=qemux86-64 bitbake vcontainer-tarball
  ./tmp/deploy/sdk/vcontainer-standalone.sh -d /opt/vcontainer -y
  source /opt/vcontainer/init-env.sh
  vdkr images

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 336 insertions, 0 deletions

diff --git a/recipes-containers/vcontainer/files/toolchain-shar-extract.sh b/recipes-containers/vcontainer/files/toolchain-shar-extract.sh
new file mode 100644
index 00000000..5e72f14d
--- /dev/null
+++ b/recipes-containers/vcontainer/files/toolchain-shar-extract.sh
@@ -0,0 +1,326 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: Copyright (C) 2025 Bruce Ashfield
+#
+# SPDX-License-Identifier: GPL-2.0-only
+
+export LC_ALL=en_US.UTF-8
+
+# The pipefail option is now part of POSIX (POSIX.1-2024) and available in more
+# and more shells. Enable it if available to make the SDK installer more robust.
+(set -o pipefail 2> /dev/null) && set -o pipefail
+
+#Make sure at least one python is installed
+INIT_PYTHON=$(command -v python3 2>/dev/null )
+[ -z "$INIT_PYTHON" ] && INIT_PYTHON=$(command -v python2 2>/dev/null)
+[ -z "$INIT_PYTHON" ] && echo "Error: The SDK needs a python installed" && exit 1
+
+# Remove invalid PATH elements first (maybe from a previously setup toolchain now deleted
+PATH=`$INIT_PYTHON -c 'import os; print(":".join(e for e in os.environ["PATH"].split(":") if os.path.exists(e)))'`
+
+tweakpath () {
+    case ":${PATH}:" in
+        *:"$1":*)
+            ;;
+        *)
+            PATH=$PATH:$1
+    esac
+}
+
+# Some systems don't have /usr/sbin or /sbin in the cleaned environment PATH but we make need it 
+# for the system's host tooling checks
+tweakpath /usr/sbin
+tweakpath /sbin
+
+INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
+SDK_ARCH=$(echo @SDK_ARCH@ | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
+
+verlte () {
+        [  "$1" = "`printf "$1\n$2" | sort -V | head -n1`" ]
+}
+
+verlt() {
+        [ "$1" = "$2" ] && return 1 || verlte $1 $2
+}
+
+verlt `uname -r` @OLDEST_KERNEL@
+if [ $? = 0 ]; then
+        echo "Error: The SDK needs a kernel > @OLDEST_KERNEL@"
+        exit 1
+fi
+
+if [ "$INST_ARCH" != "$SDK_ARCH" ]; then
+        # Allow for installation of ix86 SDK on x86_64 host
+        if [ "$INST_ARCH" != x86_64 -o "$SDK_ARCH" != ix86 ]; then
+                echo "Error: Incompatible SDK installer! Your host is $INST_ARCH and this SDK was built for $SDK_ARCH hosts."
+                exit 1
+        fi
+fi
+
+if ! xz -V > /dev/null 2>&1; then
+        echo "Error: xz is required for installation of this SDK, please install it first"
+        exit 1
+fi
+
+SDK_BUILD_PATH="@SDKPATH@"
+DEFAULT_INSTALL_DIR="@SDKPATHINSTALL@"
+SUDO_EXEC=""
+EXTRA_TAR_OPTIONS=""
+target_sdk_dir=""
+answer=""
+relocate=1
+savescripts=0
+verbose=0
+publish=0
+listcontents=0
+while getopts ":yd:npDRSl" OPT; do
+        case $OPT in
+        y)
+                answer="Y"
+                ;;
+        d)
+                target_sdk_dir=$OPTARG
+                ;;
+        n)
+                prepare_buildsystem="no"
+                ;;
+        p)
+                prepare_buildsystem="no"
+                publish=1
+                ;;
+        D)
+                verbose=1
+                ;;
+        R)
+                relocate=0
+                savescripts=1
+                ;;
+        S)
+                savescripts=1
+                ;;
+        l)
+                listcontents=1
+                ;;
+        *)
+                echo "Usage: $(basename "$0") [-y] [-d <dir>]"
+                echo "  -y         Automatic yes to all prompts"
+                echo "  -d <dir>   Install the SDK to <dir>"
+                echo "======== Extensible SDK only options ============"
+                echo "  -n         Do not prepare the build system"
+                echo "  -p         Publish mode (implies -n)"
+                echo "======== Advanced DEBUGGING ONLY OPTIONS ========"
+                echo "  -S         Save relocation scripts"
+                echo "  -R         Do not relocate executables"
+                echo "  -D         use set -x to see what is going on"
+                echo "  -l         list files that will be extracted"
+                exit 1
+                ;;
+        esac
+done
+
+payload_offset=$(($(grep -na -m1 "^MARKER:$" "$0"|cut -d':' -f1) + 1))
+if [ "$listcontents" = "1" ] ; then
+    if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then
+        tail -n +$payload_offset "$0" > sdk.zip
+        if unzip -l sdk.zip;then
+            rm sdk.zip
+        else
+            rm sdk.zip && exit 1
+        fi
+    else
+        tail -n +$payload_offset "$0"| tar tvJ || exit 1
+    fi
+    exit
+fi
+
+titlestr="@SDK_TITLE@ installer version @SDK_VERSION@"
+printf "%s\n" "$titlestr"
+printf "%${#titlestr}s\n" | tr " " "="
+
+if [ $verbose = 1 ] ; then
+        set -x
+fi
+
+@SDK_PRE_INSTALL_COMMAND@
+
+# SDK_EXTENSIBLE is exposed from the SDK_PRE_INSTALL_COMMAND above
+if [ "$SDK_EXTENSIBLE" = "1" ]; then
+        DEFAULT_INSTALL_DIR="@SDKEXTPATH@"
+fi
+
+if [ "$target_sdk_dir" = "" ]; then
+        if [ "$answer" = "Y" ]; then
+                target_sdk_dir="$DEFAULT_INSTALL_DIR"
+        else
+                read -p "Enter target directory for SDK (default: $DEFAULT_INSTALL_DIR): " target_sdk_dir
+                [ "$target_sdk_dir" = "" ] && target_sdk_dir=$DEFAULT_INSTALL_DIR
+        fi
+fi
+
+eval target_sdk_dir=$(echo "$target_sdk_dir"|sed 's/ /\\ /g')
+if [ -d "$target_sdk_dir" ]; then
+        target_sdk_dir=$(cd "$target_sdk_dir"; pwd)
+else
+        target_sdk_dir=$(readlink -m "$target_sdk_dir")
+fi
+
+# limit the length for target_sdk_dir, ensure the relocation behaviour in relocate_sdk.py has right result.
+# This is due to ELF interpreter being set to 'a'*1024 in
+# meta/recipes-core/meta/uninative-tarball.bb
+if [ ${#target_sdk_dir} -gt 1024 ]; then
+        echo "Error: The target directory path is too long!!!"
+        exit 1
+fi
+
+if [ "$SDK_EXTENSIBLE" = "1" ]; then
+        # We're going to be running the build system, additional restrictions apply
+        if echo "$target_sdk_dir" | grep -q '[+\ @$]'; then
+                echo "The target directory path ($target_sdk_dir) contains illegal" \
+                     "characters such as spaces, @, \$ or +. Abort!"
+                exit 1
+        fi
+        # The build system doesn't work well with /tmp on NFS
+        fs_dev_path="$target_sdk_dir"
+        while [ ! -d "$fs_dev_path" ] ; do
+                fs_dev_path=`dirname $fs_dev_path`
+        done
+        fs_dev_type=`stat -f -c '%t' "$fs_dev_path"`
+        if [ "$fsdevtype" = "6969" ] ; then
+                echo "The target directory path $target_sdk_dir is on NFS, this is not possible. Abort!"
+                exit 1
+        fi
+else
+        if [ -n "$(echo $target_sdk_dir|grep ' ')" ]; then
+                echo "The target directory path ($target_sdk_dir) contains spaces. Abort!"
+                exit 1
+        fi
+fi
+
+if [ -e "$target_sdk_dir/environment-setup-@REAL_MULTIMACH_TARGET_SYS@" ]; then
+        echo "The directory \"$target_sdk_dir\" already contains vcontainer tools."
+        printf "If you continue, existing files will be overwritten! Proceed [y/N]? "
+
+        default_answer="n"
+else
+        printf "You are about to install vcontainer tools (vdkr/vpdmn) to \"$target_sdk_dir\". Proceed [Y/n]? "
+
+        default_answer="y"
+fi
+
+if [ "$answer" = "" ]; then
+        read answer
+        [ "$answer" = "" ] && answer="$default_answer"
+else
+        echo $answer
+fi
+
+if [ "$answer" != "Y" -a "$answer" != "y" ]; then
+        echo "Installation aborted!"
+        exit 1
+fi
+
+# Try to create the directory (this will not succeed if user doesn't have rights)
+mkdir -p $target_sdk_dir >/dev/null 2>&1
+
+# if don't have the right to access dir, gain by sudo 
+if [ ! -x $target_sdk_dir -o ! -w $target_sdk_dir -o ! -r $target_sdk_dir ]; then 
+        if [ "$SDK_EXTENSIBLE" = "1" ]; then
+                echo "Unable to access \"$target_sdk_dir\", will not attempt to use" \
+                     "sudo as as extensible SDK cannot be used as root."
+                exit 1
+        fi
+
+        SUDO_EXEC=$(command -v "sudo")
+        if [ -z $SUDO_EXEC ]; then
+                echo "No command 'sudo' found, please install sudo first. Abort!"
+                exit 1
+        fi
+
+        # test sudo could gain root right
+        $SUDO_EXEC pwd >/dev/null 2>&1
+        [ $? -ne 0 ] && echo "Sorry, you are not allowed to execute as root." && exit 1
+
+        # now that we have sudo rights, create the directory
+        $SUDO_EXEC mkdir -p $target_sdk_dir >/dev/null 2>&1
+fi
+
+printf "Extracting vcontainer tools..."
+if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then
+    if [ -z "$(command -v unzip)" ]; then
+        echo "Aborted, unzip is required to extract the SDK archive, please make sure it's installed on your system!"
+        exit 1
+    fi
+    tail -n +$payload_offset "$0" > sdk.zip
+    if $SUDO_EXEC unzip $EXTRA_TAR_OPTIONS sdk.zip -d $target_sdk_dir;then
+        rm sdk.zip
+    else
+        rm sdk.zip && exit 1
+    fi
+elif [ @SDK_ARCHIVE_TYPE@ = "tar.zst" ]; then
+    if [ -z "$(command -v zstd)" ]; then
+        echo "Aborted, zstd is required to extract the SDK archive, please make sure it's installed on your system!"
+        exit 1
+    fi
+    tail -n +$payload_offset "$0"| zstd -T0 -dc | $SUDO_EXEC tar mx -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1
+else
+    if [ -z "$(command -v xz)" ]; then
+        echo "Aborted, xz is required to extract the SDK archive, please make sure it's installed on your system!"
+        exit 1
+    fi
+    tail -n +$payload_offset "$0"| $SUDO_EXEC tar mxJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1
+fi
+echo "done"
+
+printf "Configuring paths..."
+# fix environment paths
+real_env_setup_script=""
+for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do
+        if grep -q 'OECORE_NATIVE_SYSROOT=' $env_setup_script; then
+                # Handle custom env setup scripts that are only named
+                # environment-setup-* so that they have relocation
+                # applied - what we want beyond here is the main one
+                # rather than the one that simply sorts last
+                real_env_setup_script="$env_setup_script"
+        fi
+        $SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $env_setup_script
+done
+if [ -n "$real_env_setup_script" ] ; then
+        env_setup_script="$real_env_setup_script"
+fi
+echo "done"
+
+@SDK_POST_INSTALL_COMMAND@
+
+# delete the relocating script, so that user is forced to re-run the installer
+# if he/she wants another location for the sdk
+if [ $savescripts = 0 ] ; then
+        $SUDO_EXEC rm -f ${env_setup_script%/*}/relocate_sdk.py ${env_setup_script%/*}/relocate_sdk.sh
+fi
+
+# Execute post-relocation script
+post_relocate="$target_sdk_dir/post-relocate-setup.sh"
+if [ -e "$post_relocate" ]; then
+        $SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $post_relocate
+        $SUDO_EXEC /bin/sh $post_relocate "$target_sdk_dir" "@SDKPATH@"
+        if [ $? -ne 0 ]; then
+                echo "Executing $post_relocate failed"
+                exit 1
+        fi
+        $SUDO_EXEC rm -f $post_relocate
+fi
+
+echo ""
+echo "vcontainer tools installed successfully!"
+echo ""
+echo "To use, source the environment script:"
+echo "  \$ . $target_sdk_dir/init-env.sh"
+echo ""
+echo "Architectures included: @VCONTAINER_ARCHITECTURES@"
+echo ""
+echo "Then run:"
+echo "  \$ vdkr-<arch> images      # Docker"
+echo "  \$ vpdmn-<arch> images     # Podman"
+echo ""
+
+exit 0
+
+MARKER:
diff --git a/recipes-containers/vcontainer/files/vrunner.sh b/recipes-containers/vcontainer/files/vrunner.sh
index 588261ff..2be33765 100755
--- a/recipes-containers/vcontainer/files/vrunner.sh
+++ b/recipes-containers/vcontainer/files/vrunner.sh
@@ -872,6 +872,16 @@ if [ -n "$STATE_DIR" ]; then
     mkdir -p "$STATE_DIR"
     STATE_IMG="$STATE_DIR/$STATE_FILE"
 
+    # Migration: vpdmn used to use docker-state.img, now uses podman-state.img
+    # If old file exists but new file doesn't, rename it automatically
+    if [ "$STATE_FILE" = "podman-state.img" ]; then
+        OLD_STATE_IMG="$STATE_DIR/docker-state.img"
+        if [ -f "$OLD_STATE_IMG" ] && [ ! -f "$STATE_IMG" ]; then
+            log "INFO" "Migrating old vpdmn state file: docker-state.img -> podman-state.img"
+            mv "$OLD_STATE_IMG" "$STATE_IMG"
+        fi
+    fi
+
     if [ ! -f "$STATE_IMG" ]; then
         log "INFO" "Creating new state disk at $STATE_IMG..."
         # Create 2GB state disk for Docker storage