diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2026-01-05 18:05:43 +0000 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2026-02-09 03:32:52 +0000 |
| commit | 7584611eec5562cfc3a69af7bb8e753d93579ee5 (patch) | |
| tree | e6edfab8a402a27fd0121a310a391b4ba9bad971 | |
| parent | 7cfd91b8452db84f06f3cf675f605d4da6eb6882 (diff) | |
| download | meta-virtualization-7584611eec5562cfc3a69af7bb8e753d93579ee5.tar.gz | |
docs: fix dead references to vdkr-native and obsolete test classes
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 <bruce.ashfield@gmail.com>
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)}" | |||
| 170 | VRUNTIME_MACHINE = "${@get_vruntime_machine(d)}" | 170 | VRUNTIME_MACHINE = "${@get_vruntime_machine(d)}" |
| 171 | BLOB_ARCH = "${@get_blob_arch(d)}" | 171 | BLOB_ARCH = "${@get_blob_arch(d)}" |
| 172 | 172 | ||
| 173 | # Path to vrunner.sh from vdkr-native | 173 | # Path to vrunner.sh from vcontainer-native |
| 174 | VRUNNER_PATH = "${STAGING_BINDIR_NATIVE}/vrunner.sh" | 174 | VRUNNER_PATH = "${STAGING_BINDIR_NATIVE}/vrunner.sh" |
| 175 | 175 | ||
| 176 | # Blobs come from multiconfig deploy directory | 176 | # 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: | |||
| 20 | cp tmp/deploy/images/qemuarm64/vdkr/aarch64/initramfs.cpio.gz . | 20 | cp tmp/deploy/images/qemuarm64/vdkr/aarch64/initramfs.cpio.gz . |
| 21 | cp tmp/deploy/images/qemuarm64/vdkr/aarch64/rootfs.img . | 21 | cp tmp/deploy/images/qemuarm64/vdkr/aarch64/rootfs.img . |
| 22 | 22 | ||
| 23 | Once these files are present, vdkr-native will automatically include them. | 23 | Once these files are present, vcontainer-native will automatically include them. |
| 24 | 24 | ||
| 25 | Alternatively, set VDKR_USE_DEPLOY = "1" in local.conf to use blobs | 25 | Alternatively, set VDKR_USE_DEPLOY = "1" in local.conf to use blobs |
| 26 | directly from DEPLOY_DIR without copying to the layer. | 26 | 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: | |||
| 20 | cp tmp/deploy/images/qemux86-64/vdkr/x86_64/initramfs.cpio.gz . | 20 | cp tmp/deploy/images/qemux86-64/vdkr/x86_64/initramfs.cpio.gz . |
| 21 | cp tmp/deploy/images/qemux86-64/vdkr/x86_64/rootfs.img . | 21 | cp tmp/deploy/images/qemux86-64/vdkr/x86_64/rootfs.img . |
| 22 | 22 | ||
| 23 | Once these files are present, vdkr-native will automatically include them. | 23 | Once these files are present, vcontainer-native will automatically include them. |
| 24 | 24 | ||
| 25 | Alternatively, set VDKR_USE_DEPLOY = "1" in local.conf to use blobs | 25 | Alternatively, set VDKR_USE_DEPLOY = "1" in local.conf to use blobs |
| 26 | directly from DEPLOY_DIR without copying to the layer. | 26 | 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: | |||
| 20 | cp tmp/deploy/images/qemuarm64/vpdmn/aarch64/initramfs.cpio.gz . | 20 | cp tmp/deploy/images/qemuarm64/vpdmn/aarch64/initramfs.cpio.gz . |
| 21 | cp tmp/deploy/images/qemuarm64/vpdmn/aarch64/rootfs.img . | 21 | cp tmp/deploy/images/qemuarm64/vpdmn/aarch64/rootfs.img . |
| 22 | 22 | ||
| 23 | Once these files are present, vpdmn-native will automatically include them. | 23 | Once these files are present, vcontainer-native will automatically include them. |
| 24 | 24 | ||
| 25 | Alternatively, set VPDMN_USE_DEPLOY = "1" in local.conf to use blobs | 25 | Alternatively, set VPDMN_USE_DEPLOY = "1" in local.conf to use blobs |
| 26 | directly from DEPLOY_DIR without copying to the layer. | 26 | 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: | |||
| 20 | cp tmp/deploy/images/qemux86-64/vpdmn/x86_64/initramfs.cpio.gz . | 20 | cp tmp/deploy/images/qemux86-64/vpdmn/x86_64/initramfs.cpio.gz . |
| 21 | cp tmp/deploy/images/qemux86-64/vpdmn/x86_64/rootfs.img . | 21 | cp tmp/deploy/images/qemux86-64/vpdmn/x86_64/rootfs.img . |
| 22 | 22 | ||
| 23 | Once these files are present, vpdmn-native will automatically include them. | 23 | Once these files are present, vcontainer-native will automatically include them. |
| 24 | 24 | ||
| 25 | Alternatively, set VPDMN_USE_DEPLOY = "1" in local.conf to use blobs | 25 | Alternatively, set VPDMN_USE_DEPLOY = "1" in local.conf to use blobs |
| 26 | directly from DEPLOY_DIR without copying to the layer. | 26 | 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" | |||
| 156 | 156 | ||
| 157 | | Test Class | What It Tests | Build Required | | 157 | | Test Class | What It Tests | Build Required | |
| 158 | |------------|---------------|----------------| | 158 | |------------|---------------|----------------| |
| 159 | | `TestContainerCrossTools` | container-cross-tools-native | `bitbake container-cross-tools-native` | | ||
| 160 | | `TestContainerCrossClass` | bbclass file syntax | None (file check only) | | 159 | | `TestContainerCrossClass` | bbclass file syntax | None (file check only) | |
| 161 | | `TestOCIImageBuild` | OCI image generation | `bitbake container-app-base` (if available) | | 160 | | `TestOCIImageBuild` | OCI image generation | `bitbake container-app-base` (if available) | |
| 162 | | `TestBundledContainers` | End-to-end bundling | Full image build with `BUNDLED_CONTAINERS` | | 161 | | `TestBundledContainers` | End-to-end bundling | Full image build with `BUNDLED_CONTAINERS` | |
| 163 | | `TestVdkrRecipes` | vdkr recipe builds | `bitbake vdkr-native` | | 162 | | `TestVdkrRecipes` | vdkr recipe builds | `bitbake vcontainer-tarball` | |
| 164 | | `TestMulticonfig` | Multiconfig setup | `BBMULTICONFIG` configured | | 163 | | `TestMulticonfig` | Multiconfig setup | `BBMULTICONFIG` configured | |
| 165 | | `TestBundledContainersBoot` | **Boot image and verify containers** | Full image with Docker/Podman | | 164 | | `TestBundledContainersBoot` | **Boot image and verify containers** | Full image with Docker/Podman | |
| 166 | 165 | ||
| @@ -436,8 +435,6 @@ tests/ | |||
| 436 | │ ├── TestContainerLifecycle # ps, stop, rm | 435 | │ ├── TestContainerLifecycle # ps, stop, rm |
| 437 | │ └── TestVolumeMounts # volume mount tests | 436 | │ └── TestVolumeMounts # volume mount tests |
| 438 | ├── test_container_cross_install.py # Yocto integration tests | 437 | ├── test_container_cross_install.py # Yocto integration tests |
| 439 | │ ├── TestContainerCrossInitramfs # blob building | ||
| 440 | │ ├── TestContainerCrossTools # tools-native | ||
| 441 | │ ├── TestContainerCrossClass # bbclass syntax | 438 | │ ├── TestContainerCrossClass # bbclass syntax |
| 442 | │ ├── TestOCIImageBuild # OCI generation | 439 | │ ├── TestOCIImageBuild # OCI generation |
| 443 | │ ├── TestBundledContainers # end-to-end bundling | 440 | │ ├── TestBundledContainers # end-to-end bundling |
