From 7584611eec5562cfc3a69af7bb8e753d93579ee5 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 5 Jan 2026 18:05:43 +0000 Subject: docs: fix dead references to vdkr-native and obsolete test classes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update references to reflect the current architecture: - Change vdkr-native/vpdmn-native to vcontainer-native in comments - Remove TestContainerCrossTools and TestContainerCrossInitramfs from README - Fix build command: vdkr-native → vcontainer-tarball Signed-off-by: Bruce Ashfield --- classes/container-bundle.bbclass | 2 +- recipes-containers/vcontainer/files/blobs/vdkr/aarch64/README | 2 +- recipes-containers/vcontainer/files/blobs/vdkr/x86_64/README | 2 +- recipes-containers/vcontainer/files/blobs/vpdmn/aarch64/README | 2 +- recipes-containers/vcontainer/files/blobs/vpdmn/x86_64/README | 2 +- tests/README.md | 5 +---- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/classes/container-bundle.bbclass b/classes/container-bundle.bbclass index 406e70cc..27aa81ea 100644 --- a/classes/container-bundle.bbclass +++ b/classes/container-bundle.bbclass @@ -170,7 +170,7 @@ VRUNTIME_MULTICONFIG = "${@get_vruntime_multiconfig(d)}" VRUNTIME_MACHINE = "${@get_vruntime_machine(d)}" BLOB_ARCH = "${@get_blob_arch(d)}" -# Path to vrunner.sh from vdkr-native +# Path to vrunner.sh from vcontainer-native VRUNNER_PATH = "${STAGING_BINDIR_NATIVE}/vrunner.sh" # Blobs come from multiconfig deploy directory diff --git a/recipes-containers/vcontainer/files/blobs/vdkr/aarch64/README b/recipes-containers/vcontainer/files/blobs/vdkr/aarch64/README index cabb5100..eb7100ea 100644 --- a/recipes-containers/vcontainer/files/blobs/vdkr/aarch64/README +++ b/recipes-containers/vcontainer/files/blobs/vdkr/aarch64/README @@ -20,7 +20,7 @@ Build instructions: cp tmp/deploy/images/qemuarm64/vdkr/aarch64/initramfs.cpio.gz . cp tmp/deploy/images/qemuarm64/vdkr/aarch64/rootfs.img . -Once these files are present, vdkr-native will automatically include them. +Once these files are present, vcontainer-native will automatically include them. Alternatively, set VDKR_USE_DEPLOY = "1" in local.conf to use blobs directly from DEPLOY_DIR without copying to the layer. diff --git a/recipes-containers/vcontainer/files/blobs/vdkr/x86_64/README b/recipes-containers/vcontainer/files/blobs/vdkr/x86_64/README index 6902f729..9a17f7b4 100644 --- a/recipes-containers/vcontainer/files/blobs/vdkr/x86_64/README +++ b/recipes-containers/vcontainer/files/blobs/vdkr/x86_64/README @@ -20,7 +20,7 @@ Build instructions: cp tmp/deploy/images/qemux86-64/vdkr/x86_64/initramfs.cpio.gz . cp tmp/deploy/images/qemux86-64/vdkr/x86_64/rootfs.img . -Once these files are present, vdkr-native will automatically include them. +Once these files are present, vcontainer-native will automatically include them. Alternatively, set VDKR_USE_DEPLOY = "1" in local.conf to use blobs directly from DEPLOY_DIR without copying to the layer. diff --git a/recipes-containers/vcontainer/files/blobs/vpdmn/aarch64/README b/recipes-containers/vcontainer/files/blobs/vpdmn/aarch64/README index a4197779..b585a12a 100644 --- a/recipes-containers/vcontainer/files/blobs/vpdmn/aarch64/README +++ b/recipes-containers/vcontainer/files/blobs/vpdmn/aarch64/README @@ -20,7 +20,7 @@ Build instructions: cp tmp/deploy/images/qemuarm64/vpdmn/aarch64/initramfs.cpio.gz . cp tmp/deploy/images/qemuarm64/vpdmn/aarch64/rootfs.img . -Once these files are present, vpdmn-native will automatically include them. +Once these files are present, vcontainer-native will automatically include them. Alternatively, set VPDMN_USE_DEPLOY = "1" in local.conf to use blobs directly from DEPLOY_DIR without copying to the layer. diff --git a/recipes-containers/vcontainer/files/blobs/vpdmn/x86_64/README b/recipes-containers/vcontainer/files/blobs/vpdmn/x86_64/README index 30ddb445..a7d820d9 100644 --- a/recipes-containers/vcontainer/files/blobs/vpdmn/x86_64/README +++ b/recipes-containers/vcontainer/files/blobs/vpdmn/x86_64/README @@ -20,7 +20,7 @@ Build instructions: cp tmp/deploy/images/qemux86-64/vpdmn/x86_64/initramfs.cpio.gz . cp tmp/deploy/images/qemux86-64/vpdmn/x86_64/rootfs.img . -Once these files are present, vpdmn-native will automatically include them. +Once these files are present, vcontainer-native will automatically include them. Alternatively, set VPDMN_USE_DEPLOY = "1" in local.conf to use blobs directly from DEPLOY_DIR without copying to the layer. diff --git a/tests/README.md b/tests/README.md index 6a02678b..92719a66 100644 --- a/tests/README.md +++ b/tests/README.md @@ -156,11 +156,10 @@ BBMULTICONFIG = "vruntime-aarch64 vruntime-x86-64" | Test Class | What It Tests | Build Required | |------------|---------------|----------------| -| `TestContainerCrossTools` | container-cross-tools-native | `bitbake container-cross-tools-native` | | `TestContainerCrossClass` | bbclass file syntax | None (file check only) | | `TestOCIImageBuild` | OCI image generation | `bitbake container-app-base` (if available) | | `TestBundledContainers` | End-to-end bundling | Full image build with `BUNDLED_CONTAINERS` | -| `TestVdkrRecipes` | vdkr recipe builds | `bitbake vdkr-native` | +| `TestVdkrRecipes` | vdkr recipe builds | `bitbake vcontainer-tarball` | | `TestMulticonfig` | Multiconfig setup | `BBMULTICONFIG` configured | | `TestBundledContainersBoot` | **Boot image and verify containers** | Full image with Docker/Podman | @@ -436,8 +435,6 @@ tests/ │ ├── TestContainerLifecycle # ps, stop, rm │ └── TestVolumeMounts # volume mount tests ├── test_container_cross_install.py # Yocto integration tests -│ ├── TestContainerCrossInitramfs # blob building -│ ├── TestContainerCrossTools # tools-native │ ├── TestContainerCrossClass # bbclass syntax │ ├── TestOCIImageBuild # OCI generation │ ├── TestBundledContainers # end-to-end bundling -- cgit v1.2.3-54-g00ecf